Changeset 9757 in orxonox.OLD for branches/new_class_id/src/world_entities/weapons

Timestamp:

Sep 18, 2006, 10:06:19 PM (19 years ago)

Author:

bensch

Message:

new_class_id: hups… this was bad naming… confusing too.

Location:

branches/new_class_id/src/world_entities/weapons

Files:

• aiming_system.cc (modified) (1 diff)
• weapon.cc (modified) (3 diffs)
• weapon_manager.cc (modified) (2 diffs)

branches/new_class_id/src/world_entities/weapons/aiming_system.cc

@@ -62 +62 @@
   // registering default reactions:
   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::classID());
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
 
   this->range = 1000.0f;

branches/new_class_id/src/world_entities/weapons/weapon.cc

@@ -77 +77 @@
   if (createdObject != NULL)
   {
-    if (createdObject->isA(Weapon::classID()))
+    if (createdObject->isA(Weapon::staticClassID()))
       return dynamic_cast<Weapon*>(createdObject);
     else
@@ -93 +93 @@
   if (createdObject != NULL)
   {
-    if (createdObject->isA(Weapon::classID()))
+    if (createdObject->isA(Weapon::staticClassID()))
       return dynamic_cast<Weapon*>(createdObject);
     else
@@ -131 +131 @@
   this->defaultTarget = NULL;                      //< Nothing is Targeted by default.
 
-  this->projectile = NullClass::classID();         //< No Projectile Class is Connected to this weapon
+  this->projectile = NullClass::staticClassID();         //< No Projectile Class is Connected to this weapon
   this->projectileFactory = NULL;                  //< No Factory generating Projectiles is selected.
 

branches/new_class_id/src/world_entities/weapons/weapon_manager.cc

@@ -298 +298 @@
   {
     this->parentNode->addChild(weapon);
-    if (this->parentEntity->isA(Playable::classID()))
+    if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     weapon->setDefaultTarget(this->crosshair);
@@ -468 +468 @@
       else
         this->currentSlotConfig[i].position.deactivateNode();
-      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::classID()))
+      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::staticClassID()))
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }