Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- more compiler warning cleanup

This commit is contained in:
Mark Vejvoda 2010-10-21 17:42:45 +00:00
parent cbe6860826
commit be979590c1
12 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/windoze/g3d_viewer.vcproj
View File

@ -128,7 +128,7 @@
PrecompiledHeaderThrough=""
PrecompiledHeaderFile="c:\temp\release\$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool

2
mk/windoze/glest_configurator.vcproj
View File

@ -126,7 +126,7 @@
PrecompiledHeaderThrough=""
PrecompiledHeaderFile="c:\temp\release\$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool

2
mk/windoze/glest_editor.vcproj
View File

@ -128,7 +128,7 @@
PrecompiledHeaderThrough=""
PrecompiledHeaderFile="c:\temp\release\$(TargetName).pch"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool

4
mk/windoze/glest_game.vcproj
View File

@ -146,8 +146,8 @@
EnableEnhancedInstructionSet="1"
FloatingPointModel="0"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
WarningLevel="2"
Detect64BitPortabilityProblems="true"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4018;4244;4250"
/>

2
mk/windoze/libstreflop.vcproj
View File

@ -120,7 +120,7 @@
RuntimeTypeInfo="true"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool

2
mk/windoze/shared_lib.vcproj
View File

@ -131,7 +131,7 @@
RuntimeTypeInfo="true"
ProgramDataBaseFileName="$(IntDir)\$(ProjectName).pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
DisableSpecificWarnings="4250"
/>

4
source/glest_game/game/commander.cpp
View File

@ -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());
}

2
source/glest_game/main/main.cpp
View File

@ -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;

2
source/glest_game/menu/menu_state_custom_game.cpp
View File

@ -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());

10
source/glest_game/menu/menu_state_options.cpp
View File

@ -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<Renderer::Shadows>(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());

16
source/glest_game/network/network_message.cpp
View File

@ -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<PathFinderType>(data.pathFinderType));
for(int i= 0; i<data.factionCount; ++i){

2
source/glest_game/types/unit_type.h
View File

@ -164,7 +164,7 @@ public:
const Resource *getStoredResource(int i) const {return &storedResources[i];}
bool getCellMapCell(int x, int y, CardinalDir facing) const;
bool getMeetingPoint() const {return meetingPoint;}
bool isMobile() const {return firstSkillTypeOfClass[scMove];}
bool isMobile() const {return (firstSkillTypeOfClass[scMove] != NULL);}
Texture2D *getMeetingPointImage() const {return meetingPointImage;}
StaticSound *getSelectionSound() const {return selectionSounds.getRandSound();}
StaticSound *getCommandSound() const {return commandSounds.getRandSound();}