Changeset 7221 in orxonox.OLD for trunk/src/world_entities/power_ups/weapon_power_up.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -92 +92 @@
 }
 
-void WeaponPowerUp::setWeaponClass(const char* name)
+void WeaponPowerUp::setWeaponClass(const std::string& name)
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
   if (this->weapon == NULL)
   {
-    PRINTF(1)("Unable to load Weapon. %s\n", name);
+    PRINTF(1)("Unable to load Weapon. %s\n", name.c_str());
     this->weapon = dynamic_cast<Weapon*>(Factory::fabricate("Turret"));
   }