From 6c4186fb34cdd4f65463ecba92bafd8d61ce9332 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 16 Mar 2023 01:17:56 -0700 Subject: [PATCH] Encounter: various fixes --- scripts/zm/zgrief/zgrief_reimagined.gsc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 77d12dda..22d700de 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -331,7 +331,11 @@ set_grief_vars() level.scr_zm_ui_gametype_obj = random(gamemodes); } - level.scr_zm_ui_gametype_pro = getDvarIntDefault("ui_gametype_pro", 0); + if(getDvar("ui_gametype_pro") == "") + { + setDvar("ui_gametype_pro", 0); + } + level.scr_zm_ui_gametype_pro = getDvarInt("ui_gametype_pro"); level.noroundnumber = 1; level.zombie_powerups["meat_stink"].solo = 1; @@ -2616,7 +2620,8 @@ containment_think() foreach(player in players) { - if(player get_current_zone() == zone_name) + player_zone_name = player get_current_zone(); + if(isDefined(player_zone_name) && player_zone_name == zone_name) { if(is_player_valid(player)) { @@ -2855,7 +2860,7 @@ containment_think() { for (i = 0; i < zombies.size; i++) { - if (zombies[i] get_current_zone() == zone_name) + if (!isDefined(zombies[i] get_current_zone()) || zombies[i] get_current_zone() == zone_name) { zombies[i] dodamage(zombies[i].health + 666, zombies[i].origin); }