Changeset 6444 in orxonox.OLD for trunk

Timestamp:

Jan 8, 2006, 10:45:03 PM (19 years ago)

Author:

bensch

Message:

trunk: sliders get updated, as they should be

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (4 diffs)
• playable.h (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (3 diffs)
• weapons/weapon_manager.h (modified) (3 diffs)

trunk/src/world_entities/playable.cc

@@ -52 +52 @@
 
   if (this->currentPlayer != NULL)
-      this->currentPlayer->weaponConfigChanged();
+    this->currentPlayer->weaponConfigChanged();
 }
 
@@ -59 +59 @@
   this->weaponMan->removeWeapon(weapon);
 
+  if (this->currentPlayer != NULL)
+    this->currentPlayer->weaponConfigChanged();
+}
+
+void Playable::nextWeaponConfig()
+{
+  this->weaponMan->nextWeaponConfig();
+  if (this->currentPlayer != NULL)
+    this->currentPlayer->weaponConfigChanged();
+}
+
+void Playable::previousWeaponConfig()
+{
+  this->weaponMan->previousWeaponConfig();
   if (this->currentPlayer != NULL)
     this->currentPlayer->weaponConfigChanged();
@@ -154 +168 @@
 void  Playable::attachCamera()
 {
-       State::getCamera()->setParentSoft(this);
-       State::getCameraTarget()->setParentSoft(this);
+  State::getCamera()->setParentSoft(this);
+  State::getCameraTarget()->setParentSoft(this);
 
 }
@@ -162 +176 @@
 void  Playable::detachCamera()
 {
-
-
 }

trunk/src/world_entities/playable.h

@@ -11 +11 @@
 #include <list>
 
+#include "world_entities/weapons/weapon_manager.h"
 
 class Weapon;
-class WeaponManager;
+
 class Player;
 
@@ -31 +32 @@
     void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon);
+    void nextWeaponConfig();
+    void previousWeaponConfig();
 
     inline WeaponManager* getWeaponManager() const { return this->weaponMan; };

trunk/src/world_entities/space_ships/space_ship.cc

@@ -434 +434 @@
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
   {
-    this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
+    this->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
   }
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->getWeaponManager()->previousWeaponConfig();
+    this->previousWeaponConfig();
   else if( event.type == SDLK_w)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);

trunk/src/world_entities/weapons/weapon.cc

@@ -421 +421 @@
     if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
+    this->updateWidgets();
     // activate
     PRINTF(4)("Activating the Weapon %s\n", this->getName());
@@ -482 +483 @@
     if (this->soundBuffers[WA_SHOOT] != NULL)
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
+    this->updateWidgets();
     // fire
     this->energyLoaded -= this->minCharge;
@@ -526 +528 @@
     this->energy -= chargeSize;
   }
+
+  this->updateWidgets();
   this->reload();
   this->enterState(WS_RELOADING);

trunk/src/world_entities/weapons/weapon_manager.h

@@ -9 +9 @@
  * @TODO 1. WeaponManager should also handle a List of availiableWeapons.
  */
+
+#ifndef _WEAPON_MANAGER_H
+#define _WEAPON_MANAGER_H
 
 #include "base_object.h"
@@ -70 +73 @@
     void addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
-    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].currentWeapon: NULL; };
+    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };
 
     // FIXME ::
@@ -109 +112 @@
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
 };
+
+
+#endif /* _WEAPON_MANAGER_H */