Changeset 4952 in orxonox.OLD for orxonox

Timestamp:

Jul 24, 2005, 11:36:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: changing back and forth works

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)
• weapons/weapon_manager.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -282 +282 @@
   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;
-
-}
+  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
+    this->weaponMan->nextWeaponConf();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
+  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
+    this->weaponMan->previousWeaponConfig();
+}

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -195 +195 @@
 void WeaponManager::nextWeaponConf()
 {
-  PRINTF(4)("Changing weapon configuration: from %i to next\n", this->currentConfigID);
-
   ++this->currentConfigID;
   if (this->currentConfigID >= WM_MAX_CONFIGS)
     this->currentConfigID = 0;
-
+  this->changeWeaponConfig(this->currentConfigID);
+  this->debug();
+}
+
+void WeaponManager::previousWeaponConfig()
+{
+  --this->currentConfigID;
+  if (this->currentConfigID < 0)
+    this->currentConfigID = WM_MAX_CONFIGS -1;
+  this->changeWeaponConfig(this->currentConfigID);
+  this->debug();
+
+
+}
+
+void WeaponManager::changeWeaponConfig(int weaponConfig)
+{
+  this->currentConfigID = weaponConfig;
+  PRINTF(4)("Changing weapon configuration: to %i\n", this->currentConfigID);
   for (int i = 0; i < WM_MAX_SLOTS; i++)
   {
     this->currentSlotConfig[i].nextWeapon = this->configs[currentConfigID][i];
-    if (this->currentSlotConfig[i].currentWeapon != this->currentSlotConfig[i].nextWeapon && this->currentSlotConfig[i].currentWeapon != NULL)
+    if (this->currentSlotConfig[i].currentWeapon != NULL && this->currentSlotConfig[i].currentWeapon != this->currentSlotConfig[i].nextWeapon)
       (this->currentSlotConfig[i].currentWeapon->requestAction(WA_DEACTIVATE));
   }
-
-  this->debug();
 }
 

orxonox/trunk/src/world_entities/weapons/weapon_manager.h

@@ -86 +86 @@
 
     void nextWeaponConf();
+    void previousWeaponConfig();
+    void changeWeaponConfig(int weaponConfig);
 
     void fire();