Changeset 9406 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 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

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (2 diffs)
• param_power_up.cc (modified) (1 diff)
• power_up.cc (modified) (3 diffs)
• turret_power_up.cc (modified) (2 diffs)
• weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -23 +23 @@
 #include "primitive_model.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(LaserPowerUp, CL_LASER_POWER_UP);
@@ -78 +78 @@
 void LaserPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
 {
- // 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);
  if (entity->isA(CL_PLAYABLE))
   this->toList(OM_DEAD);

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -26 +26 @@
 #include "network_game_manager.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(ParamPowerUp, CL_PARAM_POWER_UP);

trunk/src/world_entities/power_ups/power_up.cc

@@ -24 +24 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 PowerUp::PowerUp(float r, float g, float b)
@@ -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());
     }
   }

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -23 +23 @@
 #include "primitive_model.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
@@ -74 +74 @@
 void TurretPowerUp::collidesWith(WorldEntity* entity, const Vector& location)
 {
- // 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);
  if (entity->isA(CL_PLAYABLE))
    this->toList(OM_DEAD);

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -26 +26 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);