Changeset 7350 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Apr 19, 2006, 3:42:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: our first cheat

File:

• trunk/src/world_entities/weapons/weapon.cc (modified) (8 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -26 +26 @@
 #include "util/loading/resource_manager.h"
 #include "class_list.h"
+#include "util/loading/factory.h"
 #include "util/loading/load_param.h"
 #include "state.h"
@@ -34 +35 @@
 
 #include "glgui_bar.h"
+
+using namespace std;
 
 ////////////////////
@@ -66 +69 @@
 
 /**
+ * @brief creates a new Weapon of type weaponID and returns it.
+ * @param weaponID the WeaponID type to create.
+ * @returns the newly created Weapon.
+ */
+Weapon* Weapon::createWeapon(ClassID weaponID)
+{
+  BaseObject* createdObject = Factory::fabricate(weaponID);
+  if (createdObject != NULL)
+  {
+    if (createdObject->isA(CL_WEAPON))
+      return dynamic_cast<Weapon*>(createdObject);
+    else
+    {
+      delete createdObject;
+      return NULL;
+    }
+  }
+}
+
+/**
  * initializes the Weapon with ALL default values
  *
@@ -72 +95 @@
 void Weapon::init()
 {
+  this->setClassID(CL_WEAPON, "Weapon");
   this->currentState     = WS_INACTIVE;            //< Normaly the Weapon is Inactive
   this->requestedAction  = WA_NONE;                //< No action is requested by default
@@ -382 +406 @@
   switch (action)
   {
-  case WA_SHOOT:
-    return this->fireW();
-    break;
-  case WA_CHARGE:
-    return this->chargeW();
-    break;
-  case WA_RELOAD:
-    return this->reloadW();
-    break;
-  case WA_DEACTIVATE:
-    return this->deactivateW();
-    break;
-  case WA_ACTIVATE:
-    return this->activateW();
-    break;
+    case WA_SHOOT:
+      return this->fireW();
+      break;
+    case WA_CHARGE:
+      return this->chargeW();
+      break;
+    case WA_RELOAD:
+      return this->reloadW();
+      break;
+    case WA_DEACTIVATE:
+      return this->deactivateW();
+      break;
+    case WA_ACTIVATE:
+      return this->activateW();
+      break;
   }
 }
@@ -495 +519 @@
   PRINTF(4)("Reloading Weapon %s\n", this->getName());
   if (this->ammoContainer.get() != NULL &&
-        unlikely(this->energy + this->ammoContainer->getStoredEnergy() < this->minCharge))
+      unlikely(this->energy + this->ammoContainer->getStoredEnergy() < this->minCharge))
   {
     this->requestAction(WA_DEACTIVATE);
@@ -643 +667 @@
   switch (action)
   {
-  case WA_SHOOT:
-    return "shoot";
-    break;
-  case WA_CHARGE:
-    return "charge";
-    break;
-  case WA_RELOAD:
-    return "reload";
-    break;
-  case WA_ACTIVATE:
-    return "activate";
-    break;
-  case WA_DEACTIVATE:
-    return "deactivate";
-    break;
-  case WA_SPECIAL1:
-    return "special1";
-    break;
-  default:
-    return "none";
-    break;
+    case WA_SHOOT:
+      return "shoot";
+      break;
+    case WA_CHARGE:
+      return "charge";
+      break;
+    case WA_RELOAD:
+      return "reload";
+      break;
+    case WA_ACTIVATE:
+      return "activate";
+      break;
+    case WA_DEACTIVATE:
+      return "deactivate";
+      break;
+    case WA_SPECIAL1:
+      return "special1";
+      break;
+    default:
+      return "none";
+      break;
   }
 }
@@ -706 +730 @@
   switch (state)
   {
-  case WS_SHOOTING:
-    return "shooting";
-    break;
-  case WS_CHARGING:
-    return "charging";
-    break;
-  case WS_RELOADING:
-    return "reloading";
-    break;
-  case WS_ACTIVATING:
-    return "activating";
-    break;
-  case WS_DEACTIVATING:
-    return "deactivating";
-    break;
-  case WS_IDLE:
-    return "idle";
-    break;
-  case WS_INACTIVE:
-    return "inactive";
-    break;
-  default:
-    return "none";
-    break;
-  }
-}
+    case WS_SHOOTING:
+      return "shooting";
+      break;
+    case WS_CHARGING:
+      return "charging";
+      break;
+    case WS_RELOADING:
+      return "reloading";
+      break;
+    case WS_ACTIVATING:
+      return "activating";
+      break;
+    case WS_DEACTIVATING:
+      return "deactivating";
+      break;
+    case WS_IDLE:
+      return "idle";
+      break;
+    case WS_INACTIVE:
+      return "inactive";
+      break;
+    default:
+      return "none";
+      break;
+  }
+}