Changeset 1032 for code/trunk/src/orxonox/objects/weapon

Timestamp:

Apr 12, 2008, 4:08:29 PM (17 years ago)

Author:

rgrieder

Message:

• singletonized GraphicsEngine —> Orxonox.h has to included only twice —> better compile performance —> Everything graphic related can now be accessed with GraphicsEngine::getSingleton()
• asylumized Fighter (SpaceShip with weapon system integrated)
• removed weapon system from build

File:

• code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/weapon/BaseWeapon.cc

@@ -34 +34 @@
 
 #include "util/Math.h"
-#include "../../Orxonox.h"
+#include "Orxonox.h"
 #include "Bullet.h"
 #include "BulletManager.h"
@@ -47 +47 @@
 
   BaseWeapon::BaseWeapon()
-    : sceneMgr_(Orxonox::getSingleton()->getSceneManager()),
+    : sceneMgr_(GraphicsEngine::getSingleton().getSceneManager()),
       bulletCounter_(0),
       bulletManager_(Orxonox::getSingleton()->getBulletMgr()),