Changeset 6568 in orxonox.OLD

Timestamp:

Jan 18, 2006, 3:21:47 PM (18 years ago)

Author:

bensch

Message:

trunk: weaponManager is now reporting the change of Weapons to the (if a ) Playable

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (4 diffs)
• playable.h (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -55 +55 @@
 
   if (this->currentPlayer != NULL)
-    this->currentPlayer->weaponConfigChanged();
+    this->weaponConfigChanged();
 }
 
@@ -63 +63 @@
 
   if (this->currentPlayer != NULL)
-    this->currentPlayer->weaponConfigChanged();
+    this->weaponConfigChanged();
 }
 
@@ -70 +70 @@
   this->weaponMan->nextWeaponConfig();
   if (this->currentPlayer != NULL)
-    this->currentPlayer->weaponConfigChanged();
+    this->weaponConfigChanged();
 }
 
@@ -77 +77 @@
   this->weaponMan->previousWeaponConfig();
   if (this->currentPlayer != NULL)
-    this->currentPlayer->weaponConfigChanged();
-}
-
+    this->weaponConfigChanged();
+}
+
+void Playable::weaponConfigChanged()
+{
+  this->currentPlayer->weaponConfigChanged();
+}
 
 /**

trunk/src/world_entities/playable.h

@@ -39 +39 @@
 
     inline WeaponManager* getWeaponManager() const { return this->weaponMan; };
+    void weaponConfigChanged();
+
 
     bool subscribePlayer(Player* player);

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -385 +385 @@
           tickWeapon->toList(this->parent->getOMListNumber());
           this->currentSlotConfig[i].position.activateNode();
+          if (this->parent->isA(CL_PLAYABLE))
+          {
+            dynamic_cast<Playable*>(this->parent)->weaponConfigChanged();
+          }
         }
         else