Changeset 5881 in orxonox.OLD for branches/spaceshipcontrol/src/world_entities

Timestamp:

Dec 3, 2005, 1:26:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/spaceshipcontroll: simple world-interactivity

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• playable.cc (modified) (2 diffs)
• player.cc (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (1 diff)

branches/spaceshipcontrol/src/world_entities/playable.cc

@@ -15 +15 @@
 
 #include "weapons/weapon_manager.h"
+
 #include "playable.h"
 #include "event_handler.h"
@@ -27 +28 @@
 Playable::~Playable()
 {
-
+  delete this->weaponMan;
 }
 

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -49 +49 @@
   PRINTF(4)("PLAYER INIT\n");
 
+  this->controllable = NULL;
 }
 
@@ -55 +56 @@
 void Player::process(const Event &event)
 {
-  this->controllable->process(event);
+  if (likely(this->controllable != NULL))
+    this->controllable->process(event);
 }
 
@@ -62 +64 @@
  {
 
-   this->controllable = controllable;
+   this->controllable = controllalble;
    this->controllable->subscribeEvents(this);
 

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -40 +40 @@
 SpaceShip::SpaceShip()
 {
-        this->init();
+  this->init();
 }