Changeset 4412 in orxonox.OLD for orxonox

Timestamp:

May 31, 2005, 1:05:26 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now shooting and weapon change work again

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/event/key_mapper.cc (modified) (2 diffs)
• util/event/key_mapper.h (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -426 +426 @@
   this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_LEFT);
   this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_RIGHT);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_FIRE1);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
   
   // bind camera

orxonox/trunk/src/util/event/key_mapper.cc

@@ -37 +37 @@
 int KeyMapper::PEV_FIRE1 = -1;
 int KeyMapper::PEV_FIRE2 = -1;
+int KeyMapper::PEV_PREVIOUS_WEAPON = -1;
+int KeyMapper::PEV_NEXT_WEAPON = -1;
 
 int KeyMapper::PEV_VIEW0 = -1;
@@ -64 +66 @@
                         {&KeyMapper::PEV_FIRE1, "Fire1"},
                         {&KeyMapper::PEV_FIRE2, "Fire2"},
+                        {&KeyMapper::PEV_NEXT_WEAPON, "Next"},
+                        {&KeyMapper::PEV_PREVIOUS_WEAPON, "Prev"},
+
 
                         {&KeyMapper::PEV_VIEW0, "view0"},

orxonox/trunk/src/util/event/key_mapper.h

@@ -49 +49 @@
   static int PEV_FIRE1;
   static int PEV_FIRE2;
+  static int PEV_PREVIOUS_WEAPON;
+  static int PEV_NEXT_WEAPON;
 
   static int PEV_VIEW0;

orxonox/trunk/src/world_entities/player.cc

@@ -234 +234 @@
     accel = accel+(direction*acceleration);
   if( this->bDown && this->getRelCoor().x > -5)
-    accel = accel-(direction*acceleration);
+    accel = accel -(direction*acceleration);
   if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
     accel = accel + (orthDirection*acceleration); 
@@ -300 +300 @@
       this->bRight = event.bPressed;
     }
-
-}
+  else if( event.type == KeyMapper::PEV_FIRE1)
+    {
+       this->bFire = event.bPressed;
+    }
+  else if( event.type == KeyMapper::PEV_NEXT_WEAPON)
+    {
+      if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
+    }
+
+}