Changeset 5875 in orxonox.OLD for branches

Timestamp:

Dec 2, 2005, 3:33:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/spaceshipcontrol: compiles again

Location:

branches/spaceshipcontrol/src

Files:

• Makefile.am (modified) (2 diffs)
• lib/util/list.h (modified) (2 diffs)
• world_entities/playable.cc (modified) (3 diffs)
• world_entities/playable.h (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)

branches/spaceshipcontrol/src/Makefile.am

@@ -47 +47 @@
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
+                  world_entities/playable.cc \
                   world_entities/player.cc \
                   world_entities/npcs/npc.cc \
@@ -87 +88 @@
                  world_entities/world_entity.h \
                  world_entities/camera.h \
+                 world_entities/playable.h \
                  world_entities/player.h \
                  world_entities/npcs/npc.h \

branches/spaceshipcontrol/src/lib/util/list.h

@@ -4 +4 @@
  */
 
-#ifndef _LIST_H
-#define _LIST_H
+#ifndef _T_LIST_H
+#define _T_LIST_H
 
 #include "compiler.h"
@@ -645 +645 @@
 }
 
-#endif /* _LIST_H */
+#endif /* _T_LIST_H */

branches/spaceshipcontrol/src/world_entities/playable.cc

@@ -14 +14 @@
 */
 
-#include "weapon_manager.h"
+#include "weapons/weapon_manager.h"
 #include "playable.h"
+#include "event_handler.h"
+#include "player.h"
 
 
@@ -23 +25 @@
 }
 
-Playable::init()
+Playable::~Playable()
+{
+
+}
+
+void Playable::init()
 {
   this->setClassID(CL_PLAYABLE, "Playable");
@@ -36 +43 @@
 {
   /*EventHandler*/
-  evh = EventHandler::getInstance();
+  EventHandler* evh = EventHandler::getInstance();
   for (int i = 0 ; i < events.size(); i++)
   {
-  if (!evh->isSubscribed(ES_GAME, i))
-  evh->subscribe(this, ES_GAME, i);
-}
+    if (!evh->isSubscribed(ES_GAME, i))
+      evh->subscribe(player, ES_GAME, i);
+  }
 
 }
-
-Playable::getWeaponManager()
-{
-  return weaponMan;
-}

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -21 +21 @@
 class Playable : public WorldEntity
 {
-
   public:
     Playable();
@@ -29 +28 @@
     void loadParams(const TiXmlElement* root);
 
-    virtual void addWeapon(Weapon* weapon )= 0;
-    virtual void removeWeapon(Weapon* weapon) = 0;
-    WeaponManager* getWeaponManager();
+    virtual void addWeapon(Weapon* weapon )  {}//= 0;
+    virtual void removeWeapon(Weapon* weapon) {}//= 0;
+    inline WeaponManager* getWeaponManager() const { return this->weaponMan; };
 
     void subscribeEvents(Player* player);
-    virtual void process(const Event &event) = 0;
-    virtual void setKeySet();
+    virtual void process(const Event &event) {} //= 0;
+    virtual void setKeySet() {};
     inline const std::list<Event*>& getEventList() { return this->events; };
 

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -16 +16 @@
 #include "player.h"
 
-#include "factory.h"
-
-#include "list.h"
-
 #include "event_handler.h"
-
 #include "event.h"