Changeset 637 for code/branches/FICN/src/orxonox/Orxonox.cc

Timestamp:

Dec 19, 2007, 1:49:24 AM (16 years ago)

Author:

rgrieder

Message:

 

File:

• code/branches/FICN/src/orxonox/Orxonox.cc (modified) (4 diffs)

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

@@ -68 +68 @@
 #include "core/Debug.h"
 #include "hud/HUD.h"
+#include "objects/weapon_system/bullet_manager.h"
 
 #include "GraphicsEngine.h"
@@ -166 +167 @@
     ar.checkArgument("data", this->dataPath_, false);
     ar.checkArgument("ip", serverIp_, false);
+    //mode = "presentation";
     if(ar.errorHandling()) die();
     if(mode == std::string("server"))
@@ -372 +374 @@
     auMan_ = new audio::AudioManager();
 
+    bulletMgr_ = new BulletManager();
+
     // load this file from config
     loader_ = new loader::LevelLoader("sample.oxw");
@@ -382 +386 @@
     orxonoxHud->setEnergyDistr(20,20,60);
     hudOverlay->show();
-
 
         /*