mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 10:49:48 +02:00
Code Issues Projects Releases Wiki Activity

code cleanup based on cppcheck results

Browse Source
This commit is contained in:
Mark Vejvoda
2013-05-17 04:06:39 +00:00
parent 8408526b12
commit 2fd5c2241e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,10 +50,10 @@ MenuStateOptions::MenuStateOptions(Program *program, MainMenu *mainMenu, Program
int leftLabelStart=50; int leftLabelStart=50;
int leftColumnStart=leftLabelStart+280; int leftColumnStart=leftLabelStart+280;
int rightLabelStart=450; int rightLabelStart=450;
int rightColumnStart=rightLabelStart+280; //int rightColumnStart=rightLabelStart+280;
int buttonRowPos=50; int buttonRowPos=50;
int buttonStartPos=170; int buttonStartPos=170;
int captionOffset=75; //int captionOffset=75;
int currentLabelStart=leftLabelStart; int currentLabelStart=leftLabelStart;
int currentColumnStart=leftColumnStart; int currentColumnStart=leftColumnStart;
int currentLine=700; int currentLine=700;

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

@@ -50,7 +50,7 @@ MenuStateOptionsGraphics::MenuStateOptionsGraphics(Program *program, MainMenu *m
int leftLabelStart=50; int leftLabelStart=50;
int leftColumnStart=leftLabelStart+180; int leftColumnStart=leftLabelStart+180;
int rightLabelStart=450; //int rightLabelStart=450;
//int rightColumnStart=rightLabelStart+280; //int rightColumnStart=rightLabelStart+280;
int buttonRowPos=50; int buttonRowPos=50;
int buttonStartPos=170; int buttonStartPos=170;

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

@@ -47,7 +47,7 @@ MenuStateOptionsNetwork::MenuStateOptionsNetwork(Program *program, MainMenu *mai
//modeinfos=list<ModeInfo> (); //modeinfos=list<ModeInfo> ();
int leftLabelStart=50; int leftLabelStart=50;
int leftColumnStart=leftLabelStart+280; int leftColumnStart=leftLabelStart+280;
int rightLabelStart=450; //int rightLabelStart=450;
//int rightColumnStart=rightLabelStart+280; //int rightColumnStart=rightLabelStart+280;
int buttonRowPos=50; int buttonRowPos=50;
int buttonStartPos=170; int buttonStartPos=170;

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

@@ -150,7 +150,7 @@ MenuStateOptionsSound::MenuStateOptionsSound(Program *program, MainMenu *mainMen
listBoxVolumeAmbient.setSelectedItem(intToStr(config.getInt("SoundVolumeAmbient")/5*5)); listBoxVolumeAmbient.setSelectedItem(intToStr(config.getInt("SoundVolumeAmbient")/5*5));
listBoxVolumeMusic.setSelectedItem(intToStr(config.getInt("SoundVolumeMusic")/5*5)); listBoxVolumeMusic.setSelectedItem(intToStr(config.getInt("SoundVolumeMusic")/5*5));
currentLine-=lineOffset/2; //currentLine-=lineOffset/2;

2
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@@ -812,7 +812,7 @@ time_t getFolderTreeContentsCheckSumRecursivelyLastGenerated(vector<string> path
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"-------------- In [%s::%s Line: %d] Calculating CRC for [%s] -----------\n",__FILE__,__FUNCTION__,__LINE__,pathSearchString.c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"-------------- In [%s::%s Line: %d] Calculating CRC for [%s] -----------\n",__FILE__,__FUNCTION__,__LINE__,pathSearchString.c_str());
std::pair<string,string> cacheKeys = getFolderTreeContentsCheckSumCacheKey(paths, pathSearchString, filterFileExt); std::pair<string,string> cacheKeys = getFolderTreeContentsCheckSumCacheKey(paths, pathSearchString, filterFileExt);
string cacheLookupId = cacheKeys.first; //string cacheLookupId = cacheKeys.first;
//std::map<string,uint32> &crcTreeCache = CacheManager::getCachedItem< std::map<string,uint32> >(cacheLookupId); //std::map<string,uint32> &crcTreeCache = CacheManager::getCachedItem< std::map<string,uint32> >(cacheLookupId);
string cacheKey = cacheKeys.second; string cacheKey = cacheKeys.second;