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

- added initial work to better manage rendering (but not yet enabled)

Browse Source 
- added new commandline parameter: --version
- some thread cleanup to try adjusted timings when threads shutdown
This commit is contained in:
Mark Vejvoda
2010-06-15 16:27:52 +00:00
parent 5356a3de23
commit c7c9e69567
14 changed files with 394 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/platform/sdl/platform_main.h
View File

@@ -15,7 +15,7 @@
#include <iostream>
#define MAIN_FUNCTION(X) int main(int argc, char **argv) \
{ std::cout << "About to init SDL..." << "\n"; \
{ \
if(SDL_Init(SDL_INIT_EVERYTHING) < 0) { \
std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n"; \
return 1; \

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

@@ -97,11 +97,13 @@ void BaseThread::shutdownAndWait(BaseThread *pThread) {
if(pThread->getRunningStatus() == false) {
break;
}
sleep(0);
sleep(1);
//SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
sleep(1);
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
sleep(0);
SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}

7
source/shared_lib/sources/util/util.cpp
View File

@@ -152,9 +152,8 @@ SystemFlags::~SystemFlags() {
}
void SystemFlags::Close() {
printf("START Closing logfiles\n");
if(SystemFlags::debugLogFileList.size() > 0) {
printf("START Closing logfiles\n");
for(std::map<SystemFlags::DebugType,SystemFlags::SystemFlagsType>::iterator iterMap = SystemFlags::debugLogFileList.begin();
iterMap != SystemFlags::debugLogFileList.end(); iterMap++) {
SystemFlags::SystemFlagsType &currentDebugLog = iterMap->second;
@@ -176,7 +175,9 @@ void SystemFlags::Close() {
}
}
printf("END Closing logfiles\n");
if(SystemFlags::debugLogFileList.size() > 0) {
printf("END Closing logfiles\n");
}
}
void SystemFlags::handleDebug(DebugType type, const char *fmt, ...) {