mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 15:41:24 +02:00
Code Issues Projects Releases Wiki Activity

- moved player game version text over and made its font smaller to be able to see more when long

Browse Source 
- bugfix of segfault when in mod menu
This commit is contained in:
Mark Vejvoda
2011-11-15 22:28:51 +00:00
parent 9c59bc7273
commit 85ed894cdb
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/menu/menu_state_connected_game.cpp
View File

@@ -319,10 +319,12 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
listBoxTeams[i].setEditable(false); listBoxTeams[i].setEditable(false);
labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i)); labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
labelNetStatus[i].init(xoffset+670, setupPos-30-i*rowHeight, 60); labelNetStatus[i].init(xoffset+655, setupPos-30-i*rowHeight, 60);
labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
grabSlotButton[i].registerGraphicComponent(containerName,"grabSlotButton" + intToStr(i)); grabSlotButton[i].registerGraphicComponent(containerName,"grabSlotButton" + intToStr(i));
grabSlotButton[i].init(xoffset+670, setupPos-30-i*rowHeight, 30); grabSlotButton[i].init(xoffset+660, setupPos-30-i*rowHeight, 30);
grabSlotButton[i].setText(">"); grabSlotButton[i].setText(">");
} }

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

@@ -463,7 +463,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
listBoxTeams[i].init(xoffset+590, setupPos-30-i*rowHeight, 60); listBoxTeams[i].init(xoffset+590, setupPos-30-i*rowHeight, 60);
labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i)); labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
labelNetStatus[i].init(xoffset+670, setupPos-30-i*rowHeight, 60); labelNetStatus[i].init(xoffset+655, setupPos-30-i*rowHeight, 60);
labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
} }
labelControl.registerGraphicComponent(containerName,"labelControl"); labelControl.registerGraphicComponent(containerName,"labelControl");

29
source/glest_game/menu/menu_state_mods.cpp
View File

@@ -487,6 +487,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
keyTilesetButtons.push_back(button); keyTilesetButtons.push_back(button);
} }
} }
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
for(unsigned int i=0; i < tilesetFilesUserData.size(); i++) { for(unsigned int i=0; i < tilesetFilesUserData.size(); i++) {
string tilesetName = tilesetFilesUserData[i]; string tilesetName = tilesetFilesUserData[i];
bool alreadyHasTileset = (tilesetCacheList.find(tilesetName) != tilesetCacheList.end()); bool alreadyHasTileset = (tilesetCacheList.find(tilesetName) != tilesetCacheList.end());
@@ -512,6 +518,11 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
techListRemote.clear(); techListRemote.clear();
Tokenize(techsMetaData,techListRemote,"\n"); Tokenize(techsMetaData,techListRemote,"\n");
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
getTechsLocalList(); getTechsLocalList();
for(unsigned int i=0; i < techListRemote.size(); i++) { for(unsigned int i=0; i < techListRemote.size(); i++) {
string result=refreshTechModInfo(techListRemote[i]); string result=refreshTechModInfo(techListRemote[i]);
@@ -532,6 +543,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
labelsTech.push_back(label); labelsTech.push_back(label);
} }
} }
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
for(unsigned int i=0; i < techTreeFilesUserData.size(); i++) { for(unsigned int i=0; i < techTreeFilesUserData.size(); i++) {
string techName = techTreeFilesUserData[i]; string techName = techTreeFilesUserData[i];
bool alreadyHasTech = (techCacheList.find(techName) != techCacheList.end()); bool alreadyHasTech = (techCacheList.find(techName) != techCacheList.end());
@@ -589,6 +606,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
labelsMap.push_back(label); labelsMap.push_back(label);
} }
} }
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
for(unsigned int i=0; i < mapFilesUserData.size(); i++) { for(unsigned int i=0; i < mapFilesUserData.size(); i++) {
string mapName = mapFilesUserData[i]; string mapName = mapFilesUserData[i];
bool alreadyHasMap = (mapCacheList.find(mapName) != mapCacheList.end()); bool alreadyHasMap = (mapCacheList.find(mapName) != mapCacheList.end());
@@ -640,6 +663,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
keyScenarioButtons.push_back(button); keyScenarioButtons.push_back(button);
} }
} }
if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
for(unsigned int i=0; i < scenarioFilesUserData.size(); i++) { for(unsigned int i=0; i < scenarioFilesUserData.size(); i++) {
string scenarioName = scenarioFilesUserData[i]; string scenarioName = scenarioFilesUserData[i];
bool alreadyHasScenario = (scenarioCacheList.find(scenarioName) != scenarioCacheList.end()); bool alreadyHasScenario = (scenarioCacheList.find(scenarioName) != scenarioCacheList.end());