diff options
| author | xalduin <xalduin@gmail.com> | 2010-06-07 09:38:38 +0800 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2010-06-09 20:41:00 +0800 |
| commit | be5e19d2bd3011128b12e8dfd4897b3514760941 (patch) | |
| tree | 296071fb36745d46a36732249856169d2ef88082 | |
| parent | 8625f42e304a56d48875ad1ce9e9d8ae09f1a238 (diff) | |
| download | zcatch-be5e19d2bd3011128b12e8dfd4897b3514760941.tar.gz zcatch-be5e19d2bd3011128b12e8dfd4897b3514760941.zip | |
Fixed some compiler warnings
| -rw-r--r-- | src/engine/server/server.cpp | 4 | ||||
| -rw-r--r-- | src/game/client/components/menus_demo.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 620599c8..bd5bebe1 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -554,9 +554,9 @@ void CServer::SendMap(int ClientId) { //get the name of the map without his path char * pMapShortName = &g_Config.m_SvMap[0]; - for(int i = 0; i < 128; i++) + for(int i = 0; i < 127; i++) { - if(g_Config.m_SvMap[i] == '/' || g_Config.m_SvMap[i] == '\\' && i+1 < 128) + if(g_Config.m_SvMap[i] == '/' || g_Config.m_SvMap[i] == '\\') pMapShortName = &g_Config.m_SvMap[i+1]; } diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index ec1ead8e..fd0caf62 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -519,6 +519,6 @@ void CMenus::DemoSetParentDirectory() for(i = 0; i < 256; i++) { if(i >= Stop) - m_aCurrentDemoFolder[i] = NULL; + m_aCurrentDemoFolder[i] = 0; } } |