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

Timestamp:

Jul 24, 2006, 11:09:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

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

trunk/src/world_entities/weapons/weapon.cc

@@ -36 +36 @@
 #include "elements/glgui_energywidget.h"
 
-using namespace std;
+
 
 ////////////////////
@@ -199 +199 @@
   else
   {
-    PRINTF(1)("Projectile %s does not exist for weapon %s\n", projectile.c_str(), this->getName());
+    PRINTF(1)("Projectile %s does not exist for weapon %s\n", projectile.c_str(), this->getCName());
   }
 }
@@ -213 +213 @@
     projectileFactory->prepare(count);
   else
-    PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
+    PRINTF(2)("unable to create %d projectile for Weapon %s::%s\n", count, this->getClassCName(), this->getCName());
 }
 
@@ -234 +234 @@
   else
   {
-    PRINTF(2)("No projectile defined for Weapon %s(%s) can't return any\n", this->getName(), this->getClassName());
+    PRINTF(2)("No projectile defined for Weapon %s(%s) can't return any\n", this->getCName(), this->getClassCName());
     return NULL;
   }
@@ -313 +313 @@
   {
     this->energyWidget = new OrxGui::GLGuiEnergyWidget();
-    this->energyWidget->setDisplayedName(this->getClassName());
+    this->energyWidget->setDisplayedName(this->getClassCName());
     this->energyWidget->setSize2D( 20, 100);
     this->energyWidget->setMaximum(this->getEnergyMax());
@@ -442 +442 @@
     this->updateWidgets();
     // activate
-    PRINTF(4)("Activating the Weapon %s\n", this->getName());
+    PRINTF(4)("Activating the Weapon %s\n", this->getCName());
     this->activate();
     // setting up for next action
@@ -458 +458 @@
   //  if (this->currentState != WS_INACTIVE)
   {
-    PRINTF(4)("Deactivating the Weapon %s\n", this->getName());
+    PRINTF(4)("Deactivating the Weapon %s\n", this->getCName());
     // play Sound
     if (this->soundBuffers[WA_DEACTIVATE] != NULL)
@@ -527 +527 @@
 bool Weapon::reloadW()
 {
-  PRINTF(4)("Reloading Weapon %s\n", this->getName());
+  PRINTF(4)("Reloading Weapon %s\n", this->getCName());
   if (this->ammoContainer.get() != NULL &&
       unlikely(this->energy + this->ammoContainer->getStoredEnergy() < this->minCharge))
@@ -632 +632 @@
 void Weapon::debug() const
 {
-  PRINT(0)("Weapon-Debug %s, state: %s (duration: %fs), nextAction: %s\n", this->getName(), Weapon::stateToChar(this->currentState), this->stateDuration, Weapon::actionToChar(requestedAction));
+  PRINT(0)("Weapon-Debug %s, state: %s (duration: %fs), nextAction: %s\n", this->getCName(), Weapon::stateToChar(this->currentState), this->stateDuration, Weapon::actionToChar(requestedAction));
   PRINT(0)("Energy: max: %f; current: %f; chargeMin: %f, chargeMax %f\n",
            this->energyMax, this->energy, this->minCharge, this->maxCharge);