From be979590c11f9d244e6b4c194827ac46f11f774d Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 21 Oct 2010 17:42:45 +0000 Subject: [PATCH] - more compiler warning cleanup --- mk/windoze/g3d_viewer.vcproj | 2 +- mk/windoze/glest_configurator.vcproj | 2 +- mk/windoze/glest_editor.vcproj | 2 +- mk/windoze/glest_game.vcproj | 4 ++-- mk/windoze/libstreflop.vcproj | 2 +- mk/windoze/shared_lib.vcproj | 2 +- source/glest_game/game/commander.cpp | 4 ++-- source/glest_game/main/main.cpp | 2 +- .../glest_game/menu/menu_state_custom_game.cpp | 2 +- source/glest_game/menu/menu_state_options.cpp | 10 +++++----- source/glest_game/network/network_message.cpp | 16 ++++++++-------- source/glest_game/types/unit_type.h | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/mk/windoze/g3d_viewer.vcproj b/mk/windoze/g3d_viewer.vcproj index 4b7f335e..475f8526 100755 --- a/mk/windoze/g3d_viewer.vcproj +++ b/mk/windoze/g3d_viewer.vcproj @@ -128,7 +128,7 @@ PrecompiledHeaderThrough="" PrecompiledHeaderFile="c:\temp\release\$(TargetName).pch" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> diff --git a/mk/windoze/libstreflop.vcproj b/mk/windoze/libstreflop.vcproj index 4e88b1d9..40d056ba 100644 --- a/mk/windoze/libstreflop.vcproj +++ b/mk/windoze/libstreflop.vcproj @@ -120,7 +120,7 @@ RuntimeTypeInfo="true" ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp index 1abe099f..0a26b5d4 100644 --- a/source/glest_game/game/commander.cpp +++ b/source/glest_game/game/commander.cpp @@ -279,7 +279,7 @@ CommandResult Commander::computeResult(const CommandResultContainer &results) co if(results[i]!=crSuccess){ return crSomeFailed; } - }http://de.wikipedia.org/wiki/Iatrogen + } return crSuccess; } } @@ -399,7 +399,7 @@ void Commander::giveNetworkCommand(NetworkCommand* networkCommand) const { SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] command = %p\n",__FILE__,__FUNCTION__,__LINE__,command); - unit->giveCommand(command, networkCommand->getWantQueue()); + unit->giveCommand(command, (networkCommand->getWantQueue() != 0)); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] found nctGiveCommand networkCommand->getUnitId() = %d\n",__FILE__,__FUNCTION__,__LINE__,networkCommand->getUnitId()); } diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index aeee579f..c6042784 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -453,7 +453,7 @@ bool hasCommandArgument(int argc, char** argv,const string argName, int *foundIn if(useArgParamLen == true) { compareLen = strlen(argv[idx]); } - if(strnicmp(argName.c_str(),argv[idx],compareLen) == 0) { + if(_strnicmp(argName.c_str(),argv[idx],compareLen) == 0) { result = true; if(foundIndex != NULL) { *foundIndex = idx; diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 866b40c9..0f8b033e 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -1815,7 +1815,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) { gameSettings->setFactionCount(factionCount); gameSettings->setEnableServerControlledAI(listBoxEnableServerControlledAI.getSelectedItemIndex() == 0); gameSettings->setNetworkFramePeriod((listBoxNetworkFramePeriod.getSelectedItemIndex()+1)*10); - gameSettings->setNetworkPauseGameForLaggedClients((listBoxNetworkPauseGameForLaggedClients.getSelectedItemIndex())); + gameSettings->setNetworkPauseGameForLaggedClients(((listBoxNetworkPauseGameForLaggedClients.getSelectedItemIndex() != 0))); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] gameSettings->getTileset() = [%s]\n",__FILE__,__FUNCTION__,gameSettings->getTileset().c_str()); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] gameSettings->getTech() = [%s]\n",__FILE__,__FUNCTION__,gameSettings->getTech().c_str()); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] gameSettings->getMap() = [%s]\n",__FILE__,__FUNCTION__,gameSettings->getMap().c_str()); diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 404beabd..1c3fa2e2 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -397,7 +397,7 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){ } bool currentFullscreenWindowed=config.getBool("Windowed"); - bool selectedFullscreenWindowed=listBoxFullscreenWindowed.getSelectedItemIndex(); + bool selectedFullscreenWindowed = (listBoxFullscreenWindowed.getSelectedItemIndex() != 0); if(currentFullscreenWindowed!=selectedFullscreenWindowed){ mainMessageBoxState=1; Lang &lang= Lang::getInstance(); @@ -579,11 +579,11 @@ void MenuStateOptions::saveConfig(){ int index= listBoxShadows.getSelectedItemIndex(); config.setString("Shadows", Renderer::shadowsToStr(static_cast(index))); - config.setBool("Windowed", listBoxFullscreenWindowed.getSelectedItemIndex()); + config.setBool("Windowed", (listBoxFullscreenWindowed.getSelectedItemIndex() != 0)); config.setString("Filter", listBoxFilter.getSelectedItem()); - config.setBool("Textures3D", listBoxTextures3D.getSelectedItemIndex()); - config.setBool("UnitParticles", listBoxUnitParticles.getSelectedItemIndex()); - config.setBool("MapPreview", listBoxMapPreview.getSelectedItemIndex()); + config.setBool("Textures3D", (listBoxTextures3D.getSelectedItemIndex() != 0)); + config.setBool("UnitParticles", (listBoxUnitParticles.getSelectedItemIndex() != 0)); + config.setBool("MapPreview", (listBoxMapPreview.getSelectedItemIndex() != 0)); config.setInt("MaxLights", listBoxLights.getSelectedItemIndex()+1); config.setString("FactorySound", listBoxSoundFactory.getSelectedItem()); config.setString("SoundVolumeFx", listBoxVolumeFx.getSelectedItem()); diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp index 748c4c60..0dce2d44 100644 --- a/source/glest_game/network/network_message.cpp +++ b/source/glest_game/network/network_message.cpp @@ -249,16 +249,16 @@ void NetworkMessageLaunch::buildGameSettings(GameSettings *gameSettings) const{ gameSettings->setTech(data.tech.getString()); gameSettings->setFactionCount(data.factionCount); gameSettings->setThisFactionIndex(data.thisFactionIndex); - gameSettings->setDefaultResources(data.defaultResources); - gameSettings->setDefaultUnits(data.defaultUnits); - gameSettings->setDefaultVictoryConditions(data.defaultVictoryConditions); - gameSettings->setFogOfWar(data.fogOfWar); - gameSettings->setAllowObservers(data.allowObservers); + gameSettings->setDefaultResources((data.defaultResources != 0)); + gameSettings->setDefaultUnits((data.defaultUnits != 0)); + gameSettings->setDefaultVictoryConditions((data.defaultVictoryConditions != 0)); + gameSettings->setFogOfWar((data.fogOfWar != 0)); + gameSettings->setAllowObservers((data.allowObservers != 0)); - gameSettings->setEnableObserverModeAtEndGame(data.enableObserverModeAtEndGame); - gameSettings->setEnableServerControlledAI(data.enableServerControlledAI); + gameSettings->setEnableObserverModeAtEndGame((data.enableObserverModeAtEndGame != 0)); + gameSettings->setEnableServerControlledAI((data.enableServerControlledAI != 0)); gameSettings->setNetworkFramePeriod(data.networkFramePeriod); - gameSettings->setNetworkPauseGameForLaggedClients(data.networkPauseGameForLaggedClients); + gameSettings->setNetworkPauseGameForLaggedClients((data.networkPauseGameForLaggedClients != 0)); gameSettings->setPathFinderType(static_cast(data.pathFinderType)); for(int i= 0; i