mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-27 09:54:26 +02:00
Code Issues Projects Releases Wiki Activity

- added more debug statements to try to track beta bugs

Browse Source 
- added safer customization of ini files
- added ability to customize game keys
- added more error checking for ogg file loading
- added faction loader progress
- added a few more thread protections on custom menu
This commit is contained in:
Mark Vejvoda
2010-06-12 18:27:39 +00:00
parent 25bc515466
commit 085d4e4bfe
25 changed files with 538 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/shared_lib/sources/platform/common/base_thread.cpp
View File

@@ -93,11 +93,11 @@ void BaseThread::shutdownAndWait(BaseThread *pThread) {
if(pThread != NULL && pThread->getRunningStatus() == true) {
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
pThread->signalQuit();
for( time_t elapsed = time(NULL); difftime(time(NULL),elapsed) <= 10; ) {
for( time_t elapsed = time(NULL); difftime(time(NULL),elapsed) <= 7; ) {
if(pThread->getRunningStatus() == false) {
break;
}
sleep(10);
sleep(0);
//SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);

1
source/shared_lib/sources/platform/sdl/gl_wrap.cpp
View File

@@ -108,6 +108,7 @@ void createGlFontBitmaps(uint32 &base, const string &type, int size, int width,
XFontStruct* fontInfo = XLoadQueryFont(display, type.c_str());
if(!fontInfo) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] CANNOT load font %s, falling back to default\n",__FILE__,__FUNCTION__,__LINE__,type.c_str());
fontInfo = XLoadQueryFont(display, "fixed");
if(!fontInfo) {
throw std::runtime_error("Font not found: " + type);

2
source/shared_lib/sources/platform/sdl/window.cpp
View File

@@ -543,6 +543,8 @@ char Window::getKey(SDL_keysym keysym) {
return '8';
case SDLK_9:
return '9';
case SDLK_QUESTION:
return '?';
case SDLK_a:
return 'A';
case SDLK_b: