mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-31 20:26:43 +00:00 
			
		
		
		
	partial fix for merge problems
This commit is contained in:
		
							parent
							
								
									4a3f6b0ff1
								
							
						
					
					
						commit
						417df63302
					
				
					 1 changed files with 2 additions and 5 deletions
				
			
		|  | @ -156,16 +156,13 @@ void OMW::Engine::go() | |||
|     // Start the main rendering loop
 | ||||
|     mOgre.start(); | ||||
| 
 | ||||
|     // TODO/FIXME: This hangs
 | ||||
|     //mspCommandServer->stop();
 | ||||
|     // TODO/FIXME: This crashes
 | ||||
|     //delete mpSkyManager;
 | ||||
| 
 | ||||
|     std::cout << "\nThat's all for now!\n"; | ||||
| } | ||||
| 
 | ||||
| OMW::Engine::~Engine() | ||||
| { | ||||
| //    mspCommandServer->stop();
 | ||||
|     delete mWorld; | ||||
|     delete mpSkyManager; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue