replace logger

ZedSpawner/Classes/Spawn.uc

@@ -47,43 +47,43 @@ public static function bool Load(E_LogLevel LogLevel)
 	
 	if (default.ZedTotalMultiplier <= 0.f)
 	{
-		`ZS_Error("ZedTotalMultiplier" @ "(" $ default.ZedTotalMultiplier $ ")" @ "must be greater than 0.0");
+		`Log_Error("ZedTotalMultiplier" @ "(" $ default.ZedTotalMultiplier $ ")" @ "must be greater than 0.0");
 		Errors = true;
 	}
 	
 	if (default.SpawnTotalPlayerMultiplier < 0.f)
 	{
-		`ZS_Error("SpawnTotalPlayerMultiplier" @ "(" $ default.SpawnTotalPlayerMultiplier $ ")" @ "must be greater than or equal 0.0");
+		`Log_Error("SpawnTotalPlayerMultiplier" @ "(" $ default.SpawnTotalPlayerMultiplier $ ")" @ "must be greater than or equal 0.0");
 		Errors = true;
 	}
 	
 	if (default.SpawnTotalCycleMultiplier < 0.f)
 	{
-		`ZS_Error("SpawnTotalCycleMultiplier" @ "(" $ default.SpawnTotalCycleMultiplier $ ")" @ "must be greater than or equal 0.0");
+		`Log_Error("SpawnTotalCycleMultiplier" @ "(" $ default.SpawnTotalCycleMultiplier $ ")" @ "must be greater than or equal 0.0");
 		Errors = true;
 	}
 	
 	if (default.SingleSpawnLimitMultiplier <= 0.f)
 	{
-		`ZS_Error("SingleSpawnLimitMultiplier" @ "(" $ default.SingleSpawnLimitMultiplier $ ")" @ "must be greater than 0.0");
+		`Log_Error("SingleSpawnLimitMultiplier" @ "(" $ default.SingleSpawnLimitMultiplier $ ")" @ "must be greater than 0.0");
 		Errors = true;
 	}
 	
 	if (default.SingleSpawnLimitPlayerMultiplier < 0.f)
 	{
-		`ZS_Error("SingleSpawnLimitPlayerMultiplier" @ "(" $ default.SingleSpawnLimitPlayerMultiplier $ ")" @ "must be greater than or equal 0.0");
+		`Log_Error("SingleSpawnLimitPlayerMultiplier" @ "(" $ default.SingleSpawnLimitPlayerMultiplier $ ")" @ "must be greater than or equal 0.0");
 		Errors = true;
 	}
 	
 	if (default.SingleSpawnLimitCycleMultiplier < 0.f)
 	{
-		`ZS_Error("SingleSpawnLimitCycleMultiplier" @ "(" $ default.SingleSpawnLimitCycleMultiplier $ ")" @ "must be greater than or equal 0.0");
+		`Log_Error("SingleSpawnLimitCycleMultiplier" @ "(" $ default.SingleSpawnLimitCycleMultiplier $ ")" @ "must be greater than or equal 0.0");
 		Errors = true;
 	}
 	
 	if (default.AliveSpawnLimit < 0)
 	{
-		`ZS_Error("AliveSpawnLimit" @ "(" $ default.AliveSpawnLimit $ ")" @ "must be greater than or equal 0");
+		`Log_Error("AliveSpawnLimit" @ "(" $ default.AliveSpawnLimit $ ")" @ "must be greater than or equal 0");
 		Errors = true;
 	}
 	

ZedSpawner/Classes/SpawnAtPlayerStart.uc

@@ -41,28 +41,28 @@ public static function Array<class<KFPawn_Monster> > Load(E_LogLevel LogLevel)
 	local String ZedClassTmp;
 	local int Line;
 	
-	`ZS_Info("Load zeds to spawn at player start:");
+	`Log_Info("Load zeds to spawn at player start:");
 	foreach default.ZedClass(ZedClassTmp, Line)
 	{
 		KFPMC = class<KFPawn_Monster>(DynamicLoadObject(ZedClassTmp, class'Class'));
 		if (KFPMC == None)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ ZedClassTmp);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ ZedClassTmp);
 		}
 		else
 		{
 			ZedList.AddItem(KFPMC);
-			`ZS_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ZedClassTmp);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully:" @ ZedClassTmp);
 		}
 	}
 	
 	if (ZedList.Length == default.ZedClass.Length)
 	{
-		`ZS_Info("Spawn at player start list (Zeds) loaded successfully (" $ default.ZedClass.Length @ "entries)");
+		`Log_Info("Spawn at player start list (Zeds) loaded successfully (" $ default.ZedClass.Length @ "entries)");
 	}
 	else
 	{
-		`ZS_Info("Spawn at player start list (Zeds): loaded" @ ZedList.Length @ "of" @ default.ZedClass.Length @ "entries");
+		`Log_Info("Spawn at player start list (Zeds): loaded" @ ZedList.Length @ "of" @ default.ZedClass.Length @ "entries");
 	}
 	
 	return ZedList;

ZedSpawner/Classes/SpawnListBossWaves.uc

@@ -62,7 +62,7 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 	local int                 Line;
 	local bool                Errors;
 	
-	`ZS_Info("Load boss waves spawn list:");
+	`Log_Info("Load boss waves spawn list:");
 	foreach default.Spawn(SpawnEntryCfg, Line)
 	{
 		Errors = false;
@@ -70,14 +70,14 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 		SpawnEntry.BossClass = class<KFPawn_Monster>(DynamicLoadObject(SpawnEntryCfg.BossClass, class'Class'));
 		if (SpawnEntry.BossClass == None)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Can't load boss class:" @ SpawnEntryCfg.BossClass);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load boss class:" @ SpawnEntryCfg.BossClass);
 			Errors = true;
 		}
 		
 		SpawnEntry.ZedClass = class<KFPawn_Monster>(DynamicLoadObject(SpawnEntryCfg.ZedClass, class'Class'));
 		if (SpawnEntry.ZedClass == None)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
 			Errors = true;
 		}
 		
@@ -86,45 +86,45 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 		SpawnEntry.DelayDefault = SpawnEntryCfg.Delay;
 		if (SpawnEntryCfg.Delay <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.Probability = SpawnEntryCfg.Probability / 100.f;
 		if (SpawnEntryCfg.Probability <= 0 || SpawnEntryCfg.Probability > 100)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
 			Errors = true;
 		}
 
 		SpawnEntry.SpawnCountBase = SpawnEntryCfg.SpawnCountBase;
 		if (SpawnEntry.SpawnCountBase <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.SingleSpawnLimitDefault = SpawnEntryCfg.SingleSpawnLimit;
 		if (SpawnEntry.SingleSpawnLimit < 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
 			Errors = true;
 		}
 		
 		if (!Errors)
 		{
 			SpawnList.AddItem(SpawnEntry);
-			`ZS_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (" $ SpawnEntryCfg.BossClass $ ")" @ SpawnEntryCfg.ZedClass);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (" $ SpawnEntryCfg.BossClass $ ")" @ SpawnEntryCfg.ZedClass);
 		}
 	}
 	
 	if (SpawnList.Length == default.Spawn.Length)
 	{
-		`ZS_Info("Boss spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
+		`Log_Info("Boss spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
 	}
 	else
 	{
-		`ZS_Info("Boss spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
+		`Log_Info("Boss spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
 	}
 	
 	return SpawnList;

ZedSpawner/Classes/SpawnListRegular.uc

@@ -68,7 +68,7 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 	local int                 Line;
 	local bool                Errors;
 	
-	`ZS_Info("Load spawn list:");
+	`Log_Info("Load spawn list:");
 	foreach default.Spawn(SpawnEntryCfg, Line)
 	{
 		Errors = false;
@@ -76,56 +76,56 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 		SpawnEntry.Wave = SpawnEntryCfg.Wave;
 		if (SpawnEntryCfg.Wave <= 0 || SpawnEntryCfg.Wave > 255)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Wave" @ "(" $ SpawnEntryCfg.ZedClass $ ")" @ "must be greater than 0 and less than 256");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Wave" @ "(" $ SpawnEntryCfg.ZedClass $ ")" @ "must be greater than 0 and less than 256");
 			Errors = true;
 		}
 		
 		SpawnEntry.ZedClass = class<KFPawn_Monster>(DynamicLoadObject(SpawnEntryCfg.ZedClass, class'Class'));
 		if (SpawnEntry.ZedClass == None)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
 			Errors = true;
 		}
 		
 		SpawnEntry.RelativeStartDefault = SpawnEntryCfg.RelativeStart / 100.f;
 		if (SpawnEntryCfg.RelativeStart < 0 || SpawnEntryCfg.RelativeStart > 100)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "RelativeStart" @ "(" $ SpawnEntryCfg.RelativeStart $ ")" @ "must be greater than or equal 0 and less than or equal 100");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "RelativeStart" @ "(" $ SpawnEntryCfg.RelativeStart $ ")" @ "must be greater than or equal 0 and less than or equal 100");
 			Errors = true;
 		}
 		
 		SpawnEntry.DelayDefault = SpawnEntryCfg.Delay;
 		if (SpawnEntryCfg.Delay <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.Probability = SpawnEntryCfg.Probability / 100.f;
 		if (SpawnEntryCfg.Probability <= 0 || SpawnEntryCfg.Probability > 100)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
 			Errors = true;
 		}
 		
 		SpawnEntry.SpawnCountBase = SpawnEntryCfg.SpawnCountBase;
 		if (SpawnEntry.SpawnCountBase <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.SingleSpawnLimitDefault = SpawnEntryCfg.SingleSpawnLimit;
 		if (SpawnEntry.SingleSpawnLimit < 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
 			Errors = true;
 		}
 
 		if (!Errors)
 		{
 			SpawnList.AddItem(SpawnEntry);
-			`ZS_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (w" $ SpawnEntryCfg.Wave $ ")" @ SpawnEntryCfg.ZedClass);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (w" $ SpawnEntryCfg.Wave $ ")" @ SpawnEntryCfg.ZedClass);
 		}
 	}
 	
@@ -133,11 +133,11 @@ public static function Array<S_SpawnEntry> Load(E_LogLevel LogLevel)
 	
 	if (SpawnList.Length == default.Spawn.Length)
 	{
-		`ZS_Info("Regular spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
+		`Log_Info("Regular spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
 	}
 	else
 	{
-		`ZS_Info("Regular spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
+		`Log_Info("Regular spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
 	}
 	
 	return SpawnList;

ZedSpawner/Classes/SpawnListSpecialWaves.uc

@@ -62,11 +62,11 @@ public static function Array<S_SpawnEntry> Load(KFGameInfo_Endless KFGIE, E_LogL
 	
 	if (KFGIE == None)
 	{
-		`ZS_Info("Not Endless mode, skip loading special waves");
+		`Log_Info("Not Endless mode, skip loading special waves");
 		return SpawnList;
 	}
 	
-	`ZS_Info("Load special waves spawn list:");
+	`Log_Info("Load special waves spawn list:");
 	foreach default.Spawn(SpawnEntryCfg, Line)
 	{
 		Errors = false;
@@ -74,66 +74,66 @@ public static function Array<S_SpawnEntry> Load(KFGameInfo_Endless KFGIE, E_LogL
 		SpawnEntry.Wave = SpawnEntryCfg.Wave;
 		if (KFGIE.SpecialWaveTypes.Find(EAIType(SpawnEntryCfg.Wave)) == INDEX_NONE)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Unknown special wave:" @ SpawnEntryCfg.Wave);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Unknown special wave:" @ SpawnEntryCfg.Wave);
 			Errors = true;
 		}
 		
 		SpawnEntry.ZedClass = class<KFPawn_Monster>(DynamicLoadObject(SpawnEntryCfg.ZedClass, class'Class'));
 		if (SpawnEntry.ZedClass == None)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Can't load zed class:" @ SpawnEntryCfg.ZedClass);
 			Errors = true;
 		}
 		
 		SpawnEntry.RelativeStartDefault = SpawnEntryCfg.RelativeStart / 100.f;
 		if (SpawnEntryCfg.RelativeStart < 0 || SpawnEntryCfg.RelativeStart > 100)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "RelativeStart" @ "(" $ SpawnEntryCfg.RelativeStart $ ")" @ "must be greater than or equal 0 and less than or equal 100");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "RelativeStart" @ "(" $ SpawnEntryCfg.RelativeStart $ ")" @ "must be greater than or equal 0 and less than or equal 100");
 			Errors = true;
 		}
 		
 		SpawnEntry.DelayDefault = SpawnEntryCfg.Delay;
 		if (SpawnEntryCfg.Delay <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Delay" @ "(" $ SpawnEntryCfg.Delay $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.Probability = SpawnEntryCfg.Probability / 100.f;
 		if (SpawnEntryCfg.Probability <= 0 || SpawnEntryCfg.Probability > 100)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "Probability" @ "(" $ SpawnEntryCfg.Probability $ ")" @ "must be greater than 0 and less than or equal 100");
 			Errors = true;
 		}
 		
 		SpawnEntry.SpawnCountBase = SpawnEntryCfg.SpawnCountBase;
 		if (SpawnEntry.SpawnCountBase <= 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SpawnCountBase" @ "(" $ SpawnEntryCfg.SpawnCountBase $ ")" @ "must be greater than 0");
 			Errors = true;
 		}
 		
 		SpawnEntry.SingleSpawnLimitDefault = SpawnEntryCfg.SingleSpawnLimit;
 		if (SpawnEntry.SingleSpawnLimit < 0)
 		{
-			`ZS_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
+			`Log_Warn("[" $ Line + 1 $ "]" @ "SingleSpawnLimit" @ "(" $ SpawnEntryCfg.SingleSpawnLimit $ ")" @ "must be equal or greater than 0");
 			Errors = true;
 		}
 
 		if (!Errors)
 		{
 			SpawnList.AddItem(SpawnEntry);
-			`ZS_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (" $ SpawnEntryCfg.Wave $ ")" @ SpawnEntryCfg.ZedClass);
+			`Log_Debug("[" $ Line + 1 $ "]" @ "Loaded successfully: (" $ SpawnEntryCfg.Wave $ ")" @ SpawnEntryCfg.ZedClass);
 		}
 	}
 	
 	if (SpawnList.Length == default.Spawn.Length)
 	{
-		`ZS_Info("Special spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
+		`Log_Info("Special spawn list loaded successfully (" $ default.Spawn.Length @ "entries)");
 	}
 	else
 	{
-		`ZS_Info("Special spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
+		`Log_Info("Special spawn list: loaded" @ SpawnList.Length @ "of" @ default.Spawn.Length @ "entries");
 	}
 	
 	return SpawnList;

ZedSpawner/Classes/ZedSpawner.uc

@@ -9,18 +9,6 @@ const CfgSpawnListRW        = class'SpawnListRegular';
 const CfgSpawnListBW        = class'SpawnListBossWaves';
 const CfgSpawnListSW        = class'SpawnListSpecialWaves';
 
-enum E_LogLevel
-{
-	LL_WrongLevel,
-	LL_Fatal,
-	LL_Error,
-	LL_Warning,
-	LL_Info,
-	LL_Debug,
-	LL_Trace,
-	LL_All
-};
-
 struct S_SpawnEntry
 {
 	var class<KFPawn_Monster> BossClass;
@@ -84,11 +72,11 @@ public simulated function bool SafeDestroy()
 
 public event PreBeginPlay()
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (WorldInfo.NetMode == NM_Client)
 	{
-		`ZS_Fatal("NetMode == NM_Client, Destroy...");
+		`Log_Fatal("NetMode == NM_Client, Destroy...");
 		SafeDestroy();
 		return;
 	}
@@ -98,7 +86,7 @@ public event PreBeginPlay()
 
 public event PostBeginPlay()
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (bPendingDelete || bDeleteMe) return;
 	
@@ -124,7 +112,7 @@ private function InitConfig()
 	switch (Version)
 	{
 		case `NO_CONFIG:
-			`ZS_Info("Config created");
+			`Log_Info("Config created");
 			
 		case 1:
 			Tickrate = 1.0f;
@@ -132,17 +120,17 @@ private function InitConfig()
 		case 2:
 
 		case MaxInt:
-			`ZS_Info("Config updated to version"@LatestVersion);
+			`Log_Info("Config updated to version"@LatestVersion);
 			break;
 			
 		case LatestVersion:
-			`ZS_Info("Config is up-to-date");
+			`Log_Info("Config is up-to-date");
 			break;
 			
 		default:
-			`ZS_Warn("The config version is higher than the current version (are you using an old mutator?)");
+			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
-			`ZS_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
+			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
-			`ZS_Warn("The config version will be changed to" @ LatestVersion);
+			`Log_Warn("The config version will be changed to" @ LatestVersion);
 			break;
 	}
 
@@ -158,12 +146,12 @@ private function Init()
 	local S_SpawnEntry SE;
 	local String CurrentMap;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	KFGIS = KFGameInfo_Survival(WorldInfo.Game);
 	if (KFGIS == None)
 	{
-		`ZS_Fatal("Incompatible gamemode:" @ WorldInfo.Game $ ". Destroy...");
+		`Log_Fatal("Incompatible gamemode:" @ WorldInfo.Game $ ". Destroy...");
 		SafeDestroy();
 		return;
 	}
@@ -176,25 +164,25 @@ private function Init()
 	if (LogLevel == LL_WrongLevel)
 	{
 		LogLevel = LL_Info;
-		`ZS_Warn("Wrong 'LogLevel', return to default value");
+		`Log_Warn("Wrong 'LogLevel', return to default value");
 		SaveConfig();
 	}
-	`ZS_Log("LogLevel:" @ LogLevel);
+	`Log_Base("LogLevel:" @ LogLevel);
 	
 	if (Tickrate <= 0)
 	{
-		`ZS_Error("Spawner tickrate must be positive (current value:" @ Tickrate $ ")");
+		`Log_Error("Spawner tickrate must be positive (current value:" @ Tickrate $ ")");
 	}
 	
 	if (!CfgSpawn.static.Load(LogLevel) || Tickrate <= 0)
 	{
-		`ZS_Fatal("Wrong settings, Destroy...");
+		`Log_Fatal("Wrong settings, Destroy...");
 		SafeDestroy();
 		return;
 	}
 	
 	dt = 1 / Tickrate;
-	`ZS_Info("Spawner tickrate:" @ Tickrate @ "(update every" @ dt $ "s)");
+	`Log_Info("Spawner tickrate:" @ Tickrate @ "(update every" @ dt $ "s)");
 
 	SpawnListRW = CfgSpawnListRW.static.Load(LogLevel);
 	SpawnListBW = CfgSpawnListBW.static.Load(LogLevel);
@@ -203,7 +191,7 @@ private function Init()
 	
 	CurrentMap = String(WorldInfo.GetPackageName());
 	GlobalSpawnAtPlayerStart = (CfgSpawnAtPlayerStart.default.Map.Find(CurrentMap) != INDEX_NONE);
-	`ZS_Info("GlobalSpawnAtPlayerStart:" @ GlobalSpawnAtPlayerStart $ GlobalSpawnAtPlayerStart ? "(" $ CurrentMap $ ")" : "");
+	`Log_Info("GlobalSpawnAtPlayerStart:" @ GlobalSpawnAtPlayerStart $ GlobalSpawnAtPlayerStart ? "(" $ CurrentMap $ ")" : "");
 	
 	CurrentWave = INDEX_NONE;
 	SpecialWave = INDEX_NONE;
@@ -236,7 +224,7 @@ private function PreloadContent()
 	
 	foreach CustomZeds(PawnClass)
 	{
-		`ZS_Info("Preload content:" @ PawnClass);
+		`Log_Info("Preload content:" @ PawnClass);
 		PawnClass.static.PreloadContent();
 	}
 }
@@ -261,7 +249,7 @@ private function SpawnTimer()
 	local int          Index;
 	local float        Threshold;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (KFGIS.WaveNum != 0 && CurrentWave < KFGIS.WaveNum)
 	{
@@ -333,12 +321,12 @@ private function SetupWave()
 	local S_SpawnEntry  SE;
 	local EAIType       SWType;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (CfgSpawn.default.bCyclicalSpawn && KFGIS.WaveNum > 1 && KFGIS.WaveNum == CycleWaveShift + CycleWaveSize * CurrentCycle)
 	{
 		CurrentCycle++;
-		`ZS_Info("Spawn cycle started:" @ CurrentCycle);
+		`Log_Info("Spawn cycle started:" @ CurrentCycle);
 	}
 	
 	CurrentWave = KFGIS.WaveNum;
@@ -363,7 +351,7 @@ private function SetupWave()
 		CurrentBossClass = KFGIA.BossAITypePawn(EBossAIType(KFGIS.MyKFGRI.BossIndex));
 		if (CurrentBossClass == None)
 		{
-			`ZS_Error("Can't determine boss class. Boss index:" @ KFGIS.MyKFGRI.BossIndex);
+			`Log_Error("Can't determine boss class. Boss index:" @ KFGIS.MyKFGRI.BossIndex);
 		}
 		else
 		{
@@ -380,7 +368,7 @@ private function SetupWave()
 			
 		if (WaveTotalAIDef != KFGIS.SpawnManager.WaveTotalAI)
 		{
-			`ZS_Info("increase WaveTotalAI from" @ WaveTotalAIDef @ "to" @ WaveTotalAI @ "due to ZedTotalMultiplier" @ "(" $ CfgSpawn.default.ZedTotalMultiplier $ ")");
+			`Log_Info("increase WaveTotalAI from" @ WaveTotalAIDef @ "to" @ WaveTotalAI @ "due to ZedTotalMultiplier" @ "(" $ CfgSpawn.default.ZedTotalMultiplier $ ")");
 		}
 		
 		CurrentBossClass = None;
@@ -429,7 +417,7 @@ private function SetupWave()
 		WaveTypeInfo = "(" $ WaveTypeInfo $ ")";
 	}
 	
-	`ZS_Info("Wave" @ CurrentWave @ WaveTypeInfo);
+	`Log_Info("Wave" @ CurrentWave @ WaveTypeInfo);
 }
 
 private function AdjustSpawnList(out Array<S_SpawnEntry> List)
@@ -442,7 +430,7 @@ private function AdjustSpawnList(out Array<S_SpawnEntry> List)
 	local float PawnTotalF, PawnLimitF;
 	local int ZedNameMaxLength;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	Cycle   = float(CurrentCycle);
 	Players = float(PlayerCount());
@@ -497,7 +485,7 @@ private function SpawnTimerLogger(bool Stop, optional String Comment)
 {
 	local String Message;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (Stop)
 		Message = "Stop spawn";
@@ -509,7 +497,7 @@ private function SpawnTimerLogger(bool Stop, optional String Comment)
 	
 	if (SpawnActive == Stop)
 	{
-		`ZS_Info(Message);
+		`Log_Info(Message);
 		SpawnActive = !Stop;
 	}
 }
@@ -521,7 +509,7 @@ private function SpawnEntry(out Array<S_SpawnEntry> SpawnList, int Index)
 	local String Action, Comment, NextSpawn;
 	local bool SpawnAtPlayerStart;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	SE = SpawnList[Index];
 	
@@ -595,7 +583,7 @@ private function SpawnLog(S_SpawnEntry SE, String Action, optional String Commen
 	if (Comment   != "") Comment   = ":" @ Comment;
 	if (NextSpawn != "") NextSpawn = "(" $ NextSpawn $ ")";
 	
-	`ZS_Info(String(SE.ZedClass) $ SE.ZedNameFiller @ ">" @ Action $ Comment @ NextSpawn);
+	`Log_Info(String(SE.ZedClass) $ SE.ZedNameFiller @ ">" @ Action $ Comment @ NextSpawn);
 }
 
 private function int PlayerCount()
@@ -604,7 +592,7 @@ private function int PlayerCount()
 	local int HumanPlayers;
 	local KFOnlineGameSettings KFGameSettings;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (KFGIS.PlayfabInter != None && KFGIS.PlayfabInter.GetGameSettings() != None)
 	{
@@ -629,7 +617,7 @@ private function Vector PlayerStartLocation()
 {
 	local PlayerController PC;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	foreach WorldInfo.AllControllers(class'PlayerController', PC)
 		return KFGIS.FindPlayerStart(PC, 0).Location;
@@ -648,7 +636,7 @@ private function int SpawnZed(class<KFPawn_Monster> ZedClass, int PawnCount, opt
 	local int Failed, Spawned;
 	local int Index;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	PlayerStart = PlayerStartLocation();
 	if (SpawnAtPlayerStart)
@@ -691,7 +679,7 @@ private function int SpawnZed(class<KFPawn_Monster> ZedClass, int PawnCount, opt
 		KFPM = Spawn(ZedClass,,, SpawnLocation, rot(0,0,1),, true);
 		if (KFPM == None)
 		{
-			`ZS_Error("Can't spawn" @ ZedClass);
+			`Log_Error("Can't spawn" @ ZedClass);
 			Failed++;
 			continue;
 		}
@@ -699,7 +687,7 @@ private function int SpawnZed(class<KFPawn_Monster> ZedClass, int PawnCount, opt
 		C = KFPM.Spawn(KFPM.ControllerClass);
 		if (C == None)
 		{
-			`ZS_Error("Can't spawn controller for" @ ZedClass $ ". Destroy this" @ KFPM $ "...");
+			`Log_Error("Can't spawn controller for" @ ZedClass $ ". Destroy this" @ KFPM $ "...");
 			KFPM.Destroy();
 			Failed++;
 			continue;
@@ -726,14 +714,14 @@ private function int SpawnZed(class<KFPawn_Monster> ZedClass, int PawnCount, opt
 
 public function NotifyLogin(Controller C)
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
-	`ZS_Info(`Location);
+	`Log_Info(`Location);
 	CreateRepLink(C);
 }
 
 public function NotifyLogout(Controller C)
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 
 	DestroyRepLink(C);
 }
@@ -742,7 +730,7 @@ public function bool CreateRepLink(Controller C)
 {
 	local ZedSpawnerRepLink RepLink;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (C == None) return false;
 	
@@ -765,7 +753,7 @@ public function bool DestroyRepLink(Controller C)
 {
 	local ZedSpawnerRepLink RepLink;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (C == None) return false;
 	

ZedSpawner/Classes/ZedSpawnerMut.uc

@@ -11,19 +11,19 @@ public event PreBeginPlay()
 	
 	foreach WorldInfo.DynamicActors(class'ZedSpawner', ZS)
 	{
-		`ZS_Log("Found 'ZedSpawner'");
+		`Log_Base("Found 'ZedSpawner'");
 		break;
 	}
 	
 	if (ZS == None)
 	{
-		`ZS_Log("Spawn 'ZedSpawner'");
+		`Log_Base("Spawn 'ZedSpawner'");
 		ZS = WorldInfo.Spawn(class'ZedSpawner');
 	}
 	
 	if (ZS == None)
 	{
-		`ZS_Log("Can't Spawn 'ZedSpawner', Destroy...");
+		`Log_Base("Can't Spawn 'ZedSpawner', Destroy...");
 		Destroy();
 	}
 }

ZedSpawner/Classes/ZedSpawnerRepLink.uc

@@ -13,15 +13,15 @@ replication
 
 public simulated function bool SafeDestroy()
 {
-	`ZS_Debug(`Location @ "bPendingDelete:" @ bPendingDelete @ "bDeleteMe" @ bDeleteMe);
+	`Log_Debug(`Location @ "bPendingDelete:" @ bPendingDelete @ "bDeleteMe" @ bDeleteMe);
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
 public reliable client function ClientSync(class<KFPawn_Monster> CustomZed)
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
-	`ZS_Debug("Received:" @ CustomZed);
+	`Log_Debug("Received:" @ CustomZed);
 	CustomZeds.AddItem(CustomZed);
 	ServerSync();
 }
@@ -30,11 +30,11 @@ public reliable client function SyncFinished()
 {
 	local class<KFPawn_Monster> CustomZed;
 	
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	foreach CustomZeds(CustomZed)
 	{
-		`ZS_Debug("Preload Content for" @ CustomZed);
+		`Log_Debug("Preload Content for" @ CustomZed);
 		CustomZed.static.PreloadContent();
 	}
 	
@@ -43,13 +43,13 @@ public reliable client function SyncFinished()
 
 public reliable server function ServerSync()
 {
-	`ZS_Trace(`Location);
+	`Log_Trace(`Location);
 	
 	if (bPendingDelete || bDeleteMe) return;
 	
 	if (CustomZeds.Length == Recieved || WorldInfo.NetMode == NM_StandAlone)
 	{
-		`ZS_Debug("Sync finished");
+		`Log_Debug("Sync finished");
 		SyncFinished();
 		if (!ZS.DestroyRepLink(Controller(Owner)))
 		{
@@ -58,7 +58,7 @@ public reliable server function ServerSync()
 	}
 	else
 	{
-		`ZS_Debug("Sync:" @ CustomZeds[Recieved]);
+		`Log_Debug("Sync:" @ CustomZeds[Recieved]);
 		ClientSync(CustomZeds[Recieved++]);
 	}
 }

ZedSpawner/Classes/_Logger.uc

@@ -0,0 +1,19 @@
+class _Logger extends Object
+	abstract;
+
+enum E_LogLevel
+{
+	LL_WrongLevel,
+	LL_Fatal,
+	LL_Error,
+	LL_Warning,
+	LL_Info,
+	LL_Debug,
+	LL_Trace,
+	LL_All
+};
+
+defaultproperties
+{
+	
+}

ZedSpawner/Constants.uci

@@ -0,0 +1,2 @@
+// Constants
+`define NO_CONFIG 0

ZedSpawner/Globals.uci

@@ -1,12 +1,3 @@
-`define ZS_Tag 'ZedSpawner'
+// Imports
-
+`include(Logger.uci)
-`define ZS_Log(msg, cond) `log(`msg `if(`cond), `cond`{endif},            `ZS_Tag)
+`include(Constants.uci)
-
-`define ZS_Fatal(msg)     `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `ZS_Tag)
-`define ZS_Error(msg)     `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `ZS_Tag)
-`define ZS_Warn(msg)      `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `ZS_Tag)
-`define ZS_Info(msg)      `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `ZS_Tag)
-`define ZS_Debug(msg)     `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `ZS_Tag)
-`define ZS_Trace(msg)     `log("TRACE:" @ `msg, (LogLevel >= LL_Trace),   `ZS_Tag)
-
-`define NO_CONFIG 0

ZedSpawner/Logger.uci

@@ -0,0 +1,11 @@
+// Logger
+`define Log_Tag 'ZedSpawner'
+
+`define Log_Base(msg, cond) `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
+
+`define Log_Fatal(msg)      `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
+`define Log_Error(msg)      `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
+`define Log_Warn(msg)       `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
+`define Log_Info(msg)       `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
+`define Log_Debug(msg)      `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
+`define Log_Trace(msg)      `log("TRACE:" @ `msg, (LogLevel >= LL_Trace),   `Log_Tag)