Changeset 7351 in orxonox.OLD

Timestamp:

Apr 19, 2006, 3:51:59 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the cheat is now a Static function

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (3 diffs)
• playable.h (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -37 +37 @@
 
 #include "shell_command.h"
-SHELL_COMMAND(orxoWeapon, Playable, addSomeWeapons_CHEAT);
+SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT);
 
 
@@ -133 +133 @@
     if (weapon != NULL)
       PRINTF(2)("Unable to add Weapon (%s::%s) to %s::%s\n",
-             weapon->getClassName(), weapon->getName(), this->getClassName(), this->getName());
+                weapon->getClassName(), weapon->getName(), this->getClassName(), this->getName());
     else
       PRINTF(2)("No weapon defined\n");
@@ -187 +187 @@
 void Playable::addSomeWeapons_CHEAT()
 {
-  PRINTF(2)("ADDING WEAPONS - you cheater\n");
-  this->addWeapon(Weapon::createWeapon(CL_HYPERBLASTER));
-  this->addWeapon(Weapon::createWeapon(CL_TURRET));
-  this->addWeapon(Weapon::createWeapon(CL_AIMING_TURRET));
-  this->addWeapon(Weapon::createWeapon(CL_CANNON));
-  this->addWeapon(Weapon::createWeapon(CL_TARGETING_TURRET));
-  PRINTF(2)("ADDING WEAPONS FINISHED\n");
+  if (State::getPlayer() != NULL)
+  {
+    Playable* playable = State::getPlayer()->getPlayable();
+    if (playable != NULL)
+    {
+      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));
+      PRINTF(2)("ADDING WEAPONS FINISHED\n");
+    }
+  }
 }
 

trunk/src/world_entities/playable.h

@@ -49 +49 @@
   inline WeaponManager& getWeaponManager() { return this->weaponMan; };
   void weaponConfigChanged();
-  void addSomeWeapons_CHEAT();
+  static void addSomeWeapons_CHEAT();