Changeset 7868 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

May 26, 2006, 1:21:32 PM (18 years ago)

Author:

bensch

Message:

trunk: merge Check in the Event-changes:
r7867 | bensch | 2006-05-26 13:19:46 +0200 (Fri, 26 May 2006) | 1 line

Events better subscribed

---

r7866 | bensch | 2006-05-26 13:11:10 +0200 (Fri, 26 May 2006) | 1 line

Events are subscribed at the EventListener, and not the EventHandler

Location:

trunk/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (1 diff)
• hover.cc (modified) (1 diff)
• space_ship.cc (modified) (1 diff)
• turbine_hover.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -28 +28 @@
 
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 

trunk/src/world_entities/space_ships/hover.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -31 +31 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 
 #include "network_game_manager.h"

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -26 +26 @@
 #include "util/loading/factory.h"
 #include "key_mapper.h"
-#include "event_handler.h"
 #include "state.h"
 
@@ -32 +31 @@
 #include "dot_emitter.h"
 #include "sprite_particles.h"
-
-using namespace std;
 
 CREATE_FACTORY(TurbineHover, CL_TURBINE_HOVER);
@@ -176 +173 @@
 
 
-  //add events to the eventlist
-  registerEvent(KeyMapper::PEV_FORWARD);
-  registerEvent(KeyMapper::PEV_BACKWARD);
-  registerEvent(KeyMapper::PEV_LEFT);
-  registerEvent(KeyMapper::PEV_RIGHT);
-  registerEvent(KeyMapper::PEV_UP);
-  registerEvent(KeyMapper::PEV_DOWN);
-  registerEvent(KeyMapper::PEV_FIRE1);
-  registerEvent(KeyMapper::PEV_NEXT_WEAPON);
-  registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
-  registerEvent(EV_MOUSE_MOTION);
+  //add events to the eventlist of the Playable
+  this->registerEvent(KeyMapper::PEV_FORWARD);
+  this->registerEvent(KeyMapper::PEV_BACKWARD);
+  this->registerEvent(KeyMapper::PEV_LEFT);
+  this->registerEvent(KeyMapper::PEV_RIGHT);
+  this->registerEvent(KeyMapper::PEV_UP);
+  this->registerEvent(KeyMapper::PEV_DOWN);
+  this->registerEvent(KeyMapper::PEV_FIRE1);
+  this->registerEvent(KeyMapper::PEV_NEXT_WEAPON);
+  this->registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON);
+  this->registerEvent(EV_MOUSE_MOTION);
 
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);