Changeset 5955 in orxonox.OLD for branches/powerups/src/orxonox.cc

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

• branches/powerups/src/orxonox.cc (modified) (2 diffs)

branches/powerups/src/orxonox.cc

@@ -33 +33 @@
 
 #include "world.h"
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "game_loader.h"
 
@@ -235 +235 @@
   // SDL_InitSubSystem(SDL_INIT_AUDIO);
   SoundEngine::getInstance()->initAudio();
+  SoundEngine::getInstance()->allocateSources(1);
 
   SoundEngine::getInstance()->loadSettings(this->iniParser);