Changeset 5875 in orxonox.OLD for branches/spaceshipcontrol/src/world_entities/playable.cc

Timestamp:

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

Author:

bensch

Message:

orxonox/branches/spaceshipcontrol: compiles again

File:

• branches/spaceshipcontrol/src/world_entities/playable.cc (modified) (3 diffs)

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;
-}