about summary refs log tree commit diff
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-17 12:56:49 +0100
committeroy <Tom_Adams@web.de>2011-01-17 12:56:49 +0100
commit40f6740742c7d967038abdd5a582d8b50712d1b2 (patch)
tree49c6785d3780366112d88392712bb1c3c333bd9a
parent216967c3bf72ccff9d069327a5531e50f8f88b5a (diff)
downloadzcatch-40f6740742c7d967038abdd5a582d8b50712d1b2.tar.gz
zcatch-40f6740742c7d967038abdd5a582d8b50712d1b2.zip
fixed few spelling mistakes and disabled an unused command
-rw-r--r--src/engine/server/register.cpp2
-rw-r--r--src/game/server/gamecontroller.cpp4
-rw-r--r--src/game/variables.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/server/register.cpp b/src/engine/server/register.cpp
index dfa3060f..36b26f1e 100644
--- a/src/engine/server/register.cpp
+++ b/src/engine/server/register.cpp
@@ -187,7 +187,7 @@ void CRegister::RegisterUpdate()
 			else
 			{			
 				char aBuf[256];
-				str_format(aBuf, sizeof(aBuf), "choosen '%s' as master, sending heartbeats", m_pMasterServer->GetName(m_RegisterRegisteredServer));
+				str_format(aBuf, sizeof(aBuf), "chose '%s' as master, sending heartbeats", m_pMasterServer->GetName(m_RegisterRegisteredServer));
 				m_pConsole->Print(IConsole::OUTPUT_LEVEL_STANDARD, "register", aBuf);
 				m_aMasterserverInfo[m_RegisterRegisteredServer].m_LastSend = 0;
 				RegisterNewState(REGISTERSTATE_HEARTBEAT);
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp
index 3e8af96c..23a5e171 100644
--- a/src/game/server/gamecontroller.cpp
+++ b/src/game/server/gamecontroller.cpp
@@ -626,7 +626,7 @@ bool IGameController::CheckTeamBalance()
 	char aBuf[256];
 	if(absolute(aT[0]-aT[1]) >= 2)
 	{
-		str_format(aBuf, sizeof(aBuf), "Team is NOT balanced (red=%d blue=%d)", aT[0], aT[1]);
+		str_format(aBuf, sizeof(aBuf), "Teams are NOT balanced (red=%d blue=%d)", aT[0], aT[1]);
 		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 		if(GameServer()->m_pController->m_UnbalancedTick == -1)
 			GameServer()->m_pController->m_UnbalancedTick = Server()->Tick();
@@ -634,7 +634,7 @@ bool IGameController::CheckTeamBalance()
 	}
 	else
 	{
-		str_format(aBuf, sizeof(aBuf), "Team is balanced (red=%d blue=%d)", aT[0], aT[1]);
+		str_format(aBuf, sizeof(aBuf), "Teams are balanced (red=%d blue=%d)", aT[0], aT[1]);
 		GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "game", aBuf);
 		GameServer()->m_pController->m_UnbalancedTick = -1;
 		return true;
diff --git a/src/game/variables.h b/src/game/variables.h
index 1a5575d5..0621f6af 100644
--- a/src/game/variables.h
+++ b/src/game/variables.h
@@ -25,7 +25,7 @@ MACRO_CONFIG_INT(ClMouseMaxDistance, cl_mouse_max_distance, 800, 0, 0, CFGFLAG_C
 
 MACRO_CONFIG_INT(EdShowkeys, ed_showkeys, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
 
-MACRO_CONFIG_INT(ClFlow, cl_flow, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
+//MACRO_CONFIG_INT(ClFlow, cl_flow, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
 
 MACRO_CONFIG_INT(ClShowWelcome, cl_show_welcome, 1, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "")
 MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SAVE, "How long to show the server message of the day")