comparison engine/core/controller/engine.cpp @ 643:edf6dcfe8cd4

* Modified the way we detect valid resolutions because SDL_VideoModeOK() was unreliable on a Mac when passed values returned from SDL_ListModes(). It now uses a pre-canned list of common resolutions to check.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Sat, 09 Oct 2010 17:00:33 +0000
parents 6e2151325017
children 07b1cf8e92b5
comparison
equal deleted inserted replaced
642:6e2151325017 643:edf6dcfe8cd4
101 m_vfs(0), 101 m_vfs(0),
102 m_model(0), 102 m_model(0),
103 m_gui_graphics(0), 103 m_gui_graphics(0),
104 m_logmanager(0), 104 m_logmanager(0),
105 m_cursor(0), 105 m_cursor(0),
106 m_settings() { 106 m_settings(),
107 m_devcaps(){
107 #ifdef USE_COCOA 108 #ifdef USE_COCOA
108 // The next lines ensure that Cocoa is initialzed correctly. 109 // The next lines ensure that Cocoa is initialzed correctly.
109 // This is needed for SDL to function properly on MAC OS X. 110 // This is needed for SDL to function properly on MAC OS X.
110 void* cocoa_lib; 111 void* cocoa_lib;
111 cocoa_lib = dlopen( "/System/Library/Frameworks/Cocoa.framework/Cocoa", RTLD_LAZY ); 112 cocoa_lib = dlopen( "/System/Library/Frameworks/Cocoa.framework/Cocoa", RTLD_LAZY );
306 307
307 delete m_timemanager; 308 delete m_timemanager;
308 309
309 TTF_Quit(); 310 TTF_Quit();
310 SDL_Quit(); 311 SDL_Quit();
312
311 #ifdef USE_COCOA 313 #ifdef USE_COCOA
312 objc_msgSend(m_autoreleasePool, sel_registerName("release")); 314 objc_msgSend(m_autoreleasePool, sel_registerName("release"));
313 #endif 315 #endif
316
314 FL_LOG(_log, "================== Engine destructed =================="); 317 FL_LOG(_log, "================== Engine destructed ==================");
315 m_destroyed = true; 318 m_destroyed = true;
316 //delete m_logmanager; 319 //delete m_logmanager;
317 } 320 }
318 void Engine::initializePumping() { 321 void Engine::initializePumping() {