SERVER: Handle all fog setting in Zoning_SetFog()

Author: sbeeds

source/server/ai/zoning_core.qc

@@ -188,20 +188,31 @@ void(entity players) Zoning_SetFog =
     Zoning_GetCurrentZone(players);
 
     // if this round is a dog round
-    if (roundtype == 2) {
+    if (rounds == dogRound && map_has_hellhounds) {
+        roundtype = 2;
         fog_value = strcat(game_modifier_hellhound_fog_color, "\n");
     } else {
-        // if it's a normal zombie round and there is 
-        // no fog value stored in this zone
-        if (stored_zones[players.current_zone].fog_value == "") {
-            if (game_modifier_default_fog_color != "")
-                        // use whole map fog if available
-                        fog_value = strcat(game_modifier_default_fog_color, "\n");
-                    else
-                        fog_value = "0 0 0 0 0\n";
+        // zombie round
+        roundtype = 1;
+        
+        if (has_zone_file) {
+            // no fog value stored in this zone
+            if (stored_zones[players.current_zone].fog_value == "") {
+                if (game_modifier_default_fog_color != "")
+                            // use whole map fog if available
+                            fog_value = strcat(game_modifier_default_fog_color, "\n");
+                        else
+                            fog_value = "0 0 0 0 0\n";
+            } else {
+                // we have custom fog for this zone
+                fog_value = strcat(stored_zones[players.current_zone].fog_value, "\n");
+            }
         } else {
-            // we have custom fog for this zone
-            fog_value = strcat(stored_zones[players.current_zone].fog_value, "\n");
+            if (game_modifier_default_fog_color != "") {
+				fog_value = strcat(game_modifier_default_fog_color, "\n");
+            } else {
+                fog_value = "0 0 0 0 0\n";
+            }
         }
     }
 

source/server/rounds.qc

@@ -207,7 +207,6 @@ void() EndRound =
 		triggers = find(triggers, classname, "trigger_atroundend");
 	}
 }
-
 void(entity players) Zoning_SetFog;
 void() NewRound =
 {
@@ -284,26 +283,7 @@ void() NewRound =
 		// Reset total repaired barricades for this round
 		tempe.barricade_reward = 0;
 
-		string fog_value = "";
-		if (rounds == dogRound && map_has_hellhounds) {
-			roundtype = 2;
-
-			fog_value = strcat(game_modifier_hellhound_fog_color, "\n");
-			stuffcmd(tempe, strcat("fog ", fog_value));
-		} else {
-			roundtype = 1;
-
-			if (has_zone_file) {
-				Zoning_SetFog(tempe);
-			} else {
-				if (game_modifier_default_fog_color != "")
-					fog_value = strcat(game_modifier_default_fog_color, "\n");
-				else
-					fog_value = "0 0 0 0 0\n";
-
-				stuffcmd(tempe, strcat("fog ", fog_value));
-			}
-		}
+		Zoning_SetFog(tempe);	
 
 		tempe = find(tempe, classname, "player");
 	}