Changeset 389 for code/branches/FICN/src/orxonox

Timestamp:

Dec 5, 2007, 2:30:09 PM (17 years ago)

Author:

nicolasc

Message:

merged audio into FICN

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• orxonox.cc (modified) (2 diffs)

code/branches/FICN/src/orxonox/CMakeLists.txt

@@ -24 +24 @@
   ${OIS_LIBRARIES}
   loader
+  audio
   network
   core
@@ -30 +31 @@
   weapon
 )
+

code/branches/FICN/src/orxonox/orxonox.cc

@@ -51 +51 @@
 #include "xml/xmlParser.h"
 #include "loader/LevelLoader.h"
+#include "audio/AudioManager.h"
 
 #include "spaceship_steering.h"
@@ -280 +281 @@
       void createScene(void)
       {
+                audio::AudioManager* auMan = new audio::AudioManager();
+
 
       string levelFile = "sp_level_moonstation.oxw";
       loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
     }
+
 
     void setupScene()