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

* removed quick-fix for static init problem

Browse Source
This commit is contained in:
James McCulloch
2010-03-25 19:30:35 +00:00
parent 00dd0f490d
commit 9bca65faa3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,6 @@ void MainWindow::eventClose(){
// ===================================================== // =====================================================
int glestMain(int argc, char** argv){ int glestMain(int argc, char** argv){
Shared::Graphics::ImageRegisterer::registerImageReaders();
SystemFlags::enableNetworkDebugInfo = true; SystemFlags::enableNetworkDebugInfo = true;
SystemFlags::enableDebugText = true; SystemFlags::enableDebugText = true;

3
source/shared_lib/include/graphics/ImageReaders.h
View File

@@ -31,8 +31,7 @@ namespace ImageRegisterer {
bool registerImageReaders(); bool registerImageReaders();
//Since you can't call void methods here, I have used a method doing nothing except initializing the image Readers //Since you can't call void methods here, I have used a method doing nothing except initializing the image Readers
// this static initialisation relies on other static initialisations. == bad! [was quick-fixed, registerImageReaders() is called from main()] static bool readersRegistered = registerImageReaders(); //should always return true, this should guarantee that the readers are registered <--> ImageReaders is included anywhere
// static bool readersRegistered = registerImageReaders(); //should always return true, this should guarantee that the readers are registered <--> ImageReaders is included anywhere
} }
}} //end namespace }} //end namespace