Changeset 1625 for code/trunk/src/orxonox/objects/SpaceShip.h

Timestamp:

Jun 26, 2008, 2:13:17 PM (16 years ago)

Author:

rgrieder

Message:

merged hud branch back to trunk

File:

• code/trunk/src/orxonox/objects/SpaceShip.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -36 +36 @@
 #include "Camera.h"
 #include "Model.h"
+#include "RadarViewable.h"
 #include "tools/BillboardSet.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport SpaceShip : public Model
+    class _OrxonoxExport SpaceShip : public Model, public RadarViewable
     {
         public:
@@ -131 +132 @@
             Vector3 currentOrth_;
             bool bInvertYAxis_;
-            bool setMouseEventCallback_;
             bool bLMousePressed_;
             bool bRMousePressed_;