Changeset 5961 in orxonox.OLD for branches/avi_play/src/orxonox.cc

Timestamp:

Dec 7, 2005, 2:53:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

File:

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

branches/avi_play/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);