about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authoroy <tom_adams@web.de>2011-08-03 13:53:18 -0700
committeroy <tom_adams@web.de>2011-08-03 13:53:18 -0700
commit435639636eb40ee016c77a54481a914aec311644 (patch)
tree3116c389a35eb2e4a8f1e6978c460fbc6b5b0610 /src
parent558f62f8107192c90696bf59d12c92ffcd176685 (diff)
parent83652c91ec44f5cda7c864a7492555c798bb7ff7 (diff)
downloadzcatch-435639636eb40ee016c77a54481a914aec311644.tar.gz
zcatch-435639636eb40ee016c77a54481a914aec311644.zip
Merge pull request #808 from SushiTee/master
fixed a warning
Diffstat (limited to 'src')
-rw-r--r--src/engine/server/server.cpp2
-rw-r--r--src/game/client/components/countryflags.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index ca268cc7..6f6d9e1c 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -1587,7 +1587,7 @@ void CServer::ConchainModCommandUpdate(IConsole::IResult *pResult, void *pUserDa
 	{
 		CServer *pThis = static_cast<CServer *>(pUserData);
 		const IConsole::CCommandInfo *pInfo = pThis->Console()->GetCommandInfo(pResult->GetString(0), CFGFLAG_SERVER, false);
-		int OldAccessLevel;
+		int OldAccessLevel = 0;
 		if(pInfo)
 			OldAccessLevel = pInfo->GetAccessLevel();
 		pfnCallback(pResult, pCallbackUserData);
diff --git a/src/game/client/components/countryflags.cpp b/src/game/client/components/countryflags.cpp
index ef350cd7..6daf3c2e 100644
--- a/src/game/client/components/countryflags.cpp
+++ b/src/game/client/components/countryflags.cpp
@@ -94,6 +94,7 @@ void CCountryFlags::OnInit()
 		CCountryFlag DummyEntry;
 		DummyEntry.m_CountryCode = -1;
 		DummyEntry.m_Texture = -1;
+		mem_zero(DummyEntry.m_aCountryCodeString, sizeof(DummyEntry.m_aCountryCodeString));
 		m_aCountryFlags.add(DummyEntry);
 	}
 }