Refactored some things, corrected indentation etc..

1 files changed, 24 insertions, 34 deletions

diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 58c4d9f0..7001ca32 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -136,35 +136,30 @@ bool IGameController::OnEntity(int Index, vec2 Pos)
 		m_aaSpawnPoints[1][m_aNumSpawnPoints[1]++] = Pos;
 	else if(Index == ENTITY_SPAWN_BLUE)
 		m_aaSpawnPoints[2][m_aNumSpawnPoints[2]++] = Pos;
-	/* zCatch */
-   	else if(!GameServer()->m_pController->IsZCatch())
-    	{
-        if(Index == ENTITY_ARMOR_1)
-            Type = POWERUP_ARMOR;
-        else if(Index == ENTITY_HEALTH_1)
-            Type = POWERUP_HEALTH;
-        else if(Index == ENTITY_WEAPON_SHOTGUN)
-        {
-            Type = POWERUP_WEAPON;
-            SubType = WEAPON_SHOTGUN;
-        }
-        else if(Index == ENTITY_WEAPON_GRENADE)
-        {
-            Type = POWERUP_WEAPON;
-            SubType = WEAPON_GRENADE;
-        }
-        else if(Index == ENTITY_WEAPON_RIFLE)
-        {
-            Type = POWERUP_WEAPON;
-            SubType = WEAPON_RIFLE;
-        }
-        else if(Index == ENTITY_POWERUP_NINJA && g_Config.m_SvPowerups)
-        {
-            Type = POWERUP_NINJA;
-            SubType = WEAPON_NINJA;
-        }
-    }
-    /* end zCatch*/
+	else if(Index == ENTITY_ARMOR_1)
+		Type = POWERUP_ARMOR;
+	else if(Index == ENTITY_HEALTH_1)
+		Type = POWERUP_HEALTH;
+	else if(Index == ENTITY_WEAPON_SHOTGUN)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_SHOTGUN;
+	}
+	else if(Index == ENTITY_WEAPON_GRENADE)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_GRENADE;
+	}
+	else if(Index == ENTITY_WEAPON_RIFLE)
+	{
+		Type = POWERUP_WEAPON;
+		SubType = WEAPON_RIFLE;
+	}
+	else if(Index == ENTITY_POWERUP_NINJA && g_Config.m_SvPowerups)
+	{
+		Type = POWERUP_NINJA;
+		SubType = WEAPON_NINJA;
+	}
 
 	if(Type != -1)
 	{
@@ -176,11 +171,6 @@ bool IGameController::OnEntity(int Index, vec2 Pos)
 	return false;
 }
 
-bool IGameController::IsZCatch()
-{
-	return false;
-}
-
 void IGameController::EndRound()
 {
 	if(m_Warmup) // game can't end when we are running warmup