Changeset 9869 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/playable.cc (modified) (5 diffs)

trunk/src/world_entities/playable.cc

@@ -30 +30 @@
 #include "game_rules.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "shared_network_data.h"
@@ -41 +41 @@
 SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT)
   ->setAlias("orxoWeapon");
-
+ObjectListDefinition(Playable);
 
 Playable::Playable()
@@ -48 +48 @@
     playmode(Playable::Full3D)
 {
-  this->setClassID(CL_PLAYABLE, "Playable");
+  this->registerObject(this, Playable::_objectList);
   PRINTF(4)("PLAYABLE INIT\n");
 
@@ -109 +109 @@
 bool Playable::pickup(PowerUp* powerUp)
 {
-  if(powerUp->isA(CL_WEAPON_POWER_UP))
-  {
-    return dynamic_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager());
-  }
-  else if(powerUp->isA(CL_PARAM_POWER_UP))
-  {
-    ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
+  /// FIXME TOTALLY
+  if(powerUp->isA(WeaponPowerUp::staticClassID()))
+  {
+    return static_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager());
+  }
+  else if(powerUp->isA(ParamPowerUp::staticClassID()))
+  {
+    ParamPowerUp* ppu = static_cast<ParamPowerUp*>(powerUp);
     switch(ppu->getType())
     {
@@ -213 +214 @@
     {
       PRINTF(2)("ADDING WEAPONS - you cheater\n");
-      playable->addWeapon(Weapon::createWeapon(CL_HYPERBLASTER));
-      playable->addWeapon(Weapon::createWeapon(CL_TURRET));
-      playable->addWeapon(Weapon::createWeapon(CL_AIMING_TURRET));
-      playable->addWeapon(Weapon::createWeapon(CL_CANNON));
-      playable->addWeapon(Weapon::createWeapon(CL_TARGETING_TURRET));
+      playable->addWeapon(Weapon::createWeapon("Hyperblaster"));
+      playable->addWeapon(Weapon::createWeapon("Turret"));
+      playable->addWeapon(Weapon::createWeapon("AimingTurret"));
+      playable->addWeapon(Weapon::createWeapon("Cannon"));
+      playable->addWeapon(Weapon::createWeapon("TargetingTurret"));
       PRINTF(2)("ADDING WEAPONS FINISHED\n");
     }