Changeset 9371 in orxonox.OLD for branches/proxy/src/world_entities

Timestamp:

Jul 20, 2006, 11:08:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ORXONOX is now completely std::stringed

Location:

branches/proxy/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• power_ups/power_up.cc (modified) (2 diffs)
• projectiles/projectile.cc (modified) (2 diffs)
• script_trigger.cc (modified) (10 diffs)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (2 diffs)
• spawning_point.cc (modified) (2 diffs)
• weapons/aiming_system.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (7 diffs)
• weapons/weapon_manager.cc (modified) (4 diffs)
• world_entity.cc (modified) (7 diffs)

branches/proxy/src/world_entities/creatures/fps_player.cc

@@ -299 +299 @@
       if ( victim )
       {
-        PRINTF(0)("FIRE: hit %s\n", victim->getClassName());
+        PRINTF(0)("FIRE: hit %s\n", victim->getClassCName());
         victim->hit( 20, this );
       }

branches/proxy/src/world_entities/playable.cc

@@ -148 +148 @@
     if (weapon != NULL)
       PRINTF(2)("Unable to add Weapon (%s::%s) to %s::%s\n",
-                weapon->getClassName(), weapon->getName(), this->getClassName(), this->getName());
+                weapon->getClassCName(), weapon->getCName(), this->getClassCName(), this->getCName());
     else
       PRINTF(2)("No weapon defined\n");

branches/proxy/src/world_entities/power_ups/power_up.cc

@@ -85 +85 @@
     if (this->pickupBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound.c_str(), this->getCName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getName());
+      PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound.c_str(), this->getCName());
     }
   }
@@ -106 +106 @@
     if (this->respawnBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", respawnSound.c_str(), this->getCName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getName());
+      PRINTF(2)("Failed to load sound %s to respawn %s.\n.", respawnSound.c_str(), this->getCName());
     }
   }

branches/proxy/src/world_entities/projectiles/projectile.cc

@@ -75 +75 @@
     if (this->explosionBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getCName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getName());
+      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getCName());
     }
   }
@@ -97 +97 @@
     if (this->engineBuffer != NULL)
     {
-      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getName());
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getCName());
     }
     else
     {
-      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getName());
+      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getCName());
     }
   }

branches/proxy/src/world_entities/script_trigger.cc

@@ -63 +63 @@
   addToScript = false;
   this->activeOnCreation = false;
-  
+
   if(root != NULL)
   {
-    
+
     loadParams(root);
-  
+
     if(addToScript && scriptIsOk)
     {
       script->addObject( "ScriptTrigger", this->getName());
     }
-  
-  }
-  
+
+  }
+
 }
 
 /**
  * Deletes the ScriptTrigger.
- * 
+ *
  */
 ScriptTrigger::~ScriptTrigger()
@@ -147 +147 @@
   else
   {
-    PRINTF(2)("Target %s for %s::%s does not Exist\n", target.c_str(), this->getClassName(), this->getName());
+    PRINTF(2)("Target %s for %s::%s does not Exist\n", target.c_str(), this->getClassCName(), this->getCName());
   }
 }
@@ -153 +153 @@
 /**
  * Sets the parent of the trigger.
- * @param parent The parrent. 
+ * @param parent The parrent.
  */
 void ScriptTrigger::setTriggerParent(const std::string& parent)
@@ -166 +166 @@
   else
   {
-    PRINTF(2)("Parent %s for %s::%s does not Exist\n", parent.c_str(), this->getClassName(), this->getName());
+    PRINTF(2)("Parent %s for %s::%s does not Exist\n", parent.c_str(), this->getClassCName(), this->getCName());
   }
 }
@@ -179 +179 @@
      return;
    }
-   
+
   if(triggerRemains && scriptCalled)
   {
@@ -185 +185 @@
     return;
   }
-  
+
   if( !invert && this->distance(target) < radius)
   {
@@ -191 +191 @@
     scriptCalled = true;
     return;
-  
+
   }
   else if( invert && this->distance(target) > radius)
   {
-    executeAction(timestep); 
+    executeAction(timestep);
     scriptCalled = true;
     return;
@@ -207 +207 @@
 void ScriptTrigger::executeAction(float timestep)
 {
-  
+
   if(scriptIsOk)
   {
@@ -213 +213 @@
     if(!(script->selectFunction(this->functionName,returnCount)) )
       PRINT(1)("Error ScriptTrigger: Selection of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
-     
+
     script->pushParam( timestep, this->functionName);
-     
+
     if( !(script->executeFunction()) )
       PRINT(1)("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
-     
+
     scriptFinished = script->getReturnedBool();
   }
-     
-     
+
+
 }
 
@@ -268 +268 @@
    float retf = script->getReturnedFloat();
    printf("main returned %f\n",retf);
-   
+
 
    printf("-------------------------- top of the stack:%i\n",lua_gettop(script->getLuaState()));

branches/proxy/src/world_entities/space_ships/space_ship.cc

@@ -319 +319 @@
     }
   }
-  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
 }
 

branches/proxy/src/world_entities/space_ships/spacecraft_2d.cc

@@ -324 +324 @@
 
     default:
-      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassName());
+      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassCName());
   }
 }
@@ -474 +474 @@
 
     default:
-      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassName());
+      PRINTF(2)("Playmode %s Not Implemented in %s\n", Playable::playmodeToString(this->getPlaymode()).c_str(), this->getClassCName());
   }
 }

branches/proxy/src/world_entities/spawning_point.cc

@@ -123 +123 @@
     return;
 
-  PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassName());
+  PRINTF(0)("Spawningpoint spawns Entity (%s)\n", entity->getClassCName());
 
 
@@ -203 +203 @@
 void SpawningPoint::sendRespawnMessage( int uniqueId )
 {
-#warning this bye array is not been deleted according to valginrd
+#warning this byte array is not being deleted according to valginrd
   byte * buf = new byte[2*INTSIZE];
 

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

@@ -101 +101 @@
   }
 
-  PRINTF(0)("entity: %s\n", nearestEntity->getClassName());
+  PRINTF(0)("entity: %s\n", nearestEntity->getClassCName());
     return nearestEntity;
 }

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

@@ -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;
   }
@@ -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);

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

@@ -83 +83 @@
     // NAMING
     char* tmpName;
-    if (this->getName())
-    {
-      tmpName = new char[strlen(this->getName()) + 10];
-      sprintf(tmpName, "%s_slot%d", this->getName(), i);
+    if (!this->getName().empty())
+    {
+      tmpName = new char[this->getName().size() + 10];
+      sprintf(tmpName, "%s_slot%d", this->getCName(), i);
     }
     else
@@ -265 +265 @@
   if (configID > 0 && slotID > 0 && this->configs[configID][slotID] != NULL)
   {
-    PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->getName(), weapon->getClassName(), weapon->getName());
+    PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->getCName(), weapon->getClassCName(), weapon->getCName());
     return false;
   }
@@ -302 +302 @@
     weapon->setDefaultTarget(this->crosshair);
   }
-  PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassName(), weapon->getName(), configID, slotID);
+  PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassCName(), weapon->getCName(), configID, slotID);
   return true;
 }
@@ -555 +555 @@
     {
       if (this->configs[i][j] != NULL)
-        PRINT(3)("Slot %d loaded a %s\n", j, this->configs[i][j]->getClassName());
-    }
-  }
-}
+        PRINT(3)("Slot %d loaded a %s\n", j, this->configs[i][j]->getClassCName());
+    }
+  }
+}

branches/proxy/src/world_entities/world_entity.cc

@@ -414 +414 @@
 bool WorldEntity::registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
 {
-  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassName(), entityB->getClassName());
+  PRINTF(5)("registering collision of type: %s vs %s\n", entityA->getClassCName(), entityB->getClassCName());
   // is there any handler listening?
   if( !this->bReactive)
@@ -518 +518 @@
 void WorldEntity::collidesWithGround(const Vector& location)
 {
-  PRINTF(0)("BSP_GROUND: %s collides \n", this->getClassName() );
+  PRINTF(0)("BSP_GROUND: %s collides \n", this->getClassCName() );
 }
 
@@ -676 +676 @@
   if (this->health > this->healthMax)
   {
-    PRINTF(3)("new maxHealth is bigger as the old health. Did you really intend to do this for (%s::%s)\n", this->getClassName(), this->getName());
+    PRINTF(3)("new maxHealth is bigger as the old health. Did you really intend to do this for (%s::%s)\n", this->getClassCName(), this->getCName());
     this->health = this->healthMax;
   }
@@ -699 +699 @@
   }
   else
-    PRINTF(3)("Allready created the HealthWidget for %s::%s\n", this->getClassName(), this->getName());
+    PRINTF(3)("Allready created the HealthWidget for %s::%s\n", this->getClassCName(), this->getCName());
 }
 
@@ -745 +745 @@
   this->decreaseHealth(damage);
 
-  PRINTF(5)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+  PRINTF(5)("Hit me: %s::%s now only %f/%f health\n", this->getClassCName(), this->getCName(), this->getHealth(), this->getHealthMax());
 
   if( this->getHealth() > 0)
@@ -811 +811 @@
 void WorldEntity::debugEntity() const
 {
-  PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassName(), this->getName());
+  PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassCName(), this->getCName());
   this->debugNode();
   PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber) , this->models.size());
@@ -817 +817 @@
   {
     if (models[i] != NULL)
-      PRINT(0)(" : %d:%s", i, this->models[i]->getName());
+      PRINT(0)(" : %d:%s", i, this->models[i]->getCName());
   }
   PRINT(0)("\n");