Changeset 5225 in orxonox.OLD for trunk/src/orxonox.cc

Timestamp:

Sep 23, 2005, 10:07:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removing some initialisation-stuff… i hope this works

File:

• trunk/src/orxonox.cc (modified) (4 diffs)

trunk/src/orxonox.cc

@@ -104 +104 @@
   delete[] this->configFileName;
 
+  SDL_QuitSubSystem(SDL_INIT_TIMER);
   ClassList::debug();
 
@@ -172 +173 @@
 
   // initialize everything
-  SDL_Init (SDL_INIT_TIMER);
+  SDL_InitSubSystem (SDL_INIT_TIMER);
   if( initResources () == -1) return -1;
   if( initVideo() == -1) return -1;
@@ -195 +196 @@
 
   char* iconName = ResourceManager::getFullName("pictures/fighter-top-32x32.bmp");
-  GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
-  delete[] iconName;
+  if (iconName != NULL)
+  {
+    GraphicsEngine::getInstance()->setWindowName(PACKAGE_NAME " " PACKAGE_VERSION, iconName);
+    delete[] iconName;
+  }
   return 0;
 }
@@ -206 +210 @@
 {
   PRINT(3)("> Initializing sound\n");
-  // SDL_Init(SDL_INIT_AUDIO);
+  // SDL_InitSubSystem(SDL_INIT_AUDIO);
   SoundEngine::getInstance()->initAudio();