Changeset 9406 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.cc
- Timestamp:
- Jul 24, 2006, 11:09:47 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/weapons/weapon_manager.cc
r8844 r9406 83 83 // NAMING 84 84 char* tmpName; 85 if ( this->getName())86 { 87 tmpName = new char[ strlen(this->getName()) + 10];88 sprintf(tmpName, "%s_slot%d", this->get Name(), i);85 if (!this->getName().empty()) 86 { 87 tmpName = new char[this->getName().size() + 10]; 88 sprintf(tmpName, "%s_slot%d", this->getCName(), i); 89 89 } 90 90 else … … 265 265 if (configID > 0 && slotID > 0 && this->configs[configID][slotID] != NULL) 266 266 { 267 PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->get Name(), weapon->getClassName(), weapon->getName());267 PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->getCName(), weapon->getClassCName(), weapon->getCName()); 268 268 return false; 269 269 } … … 302 302 weapon->setDefaultTarget(this->crosshair); 303 303 } 304 PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClass Name(), weapon->getName(), configID, slotID);304 PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassCName(), weapon->getCName(), configID, slotID); 305 305 return true; 306 306 } … … 555 555 { 556 556 if (this->configs[i][j] != NULL) 557 PRINT(3)("Slot %d loaded a %s\n", j, this->configs[i][j]->getClass Name());558 } 559 } 560 } 557 PRINT(3)("Slot %d loaded a %s\n", j, this->configs[i][j]->getClassCName()); 558 } 559 } 560 }
Note: See TracChangeset
for help on using the changeset viewer.