Changeset 6728 in orxonox.OLD for trunk/src/world_entities/weapons
- Timestamp:
- Jan 25, 2006, 6:02:36 PM (19 years ago)
- Location:
- trunk/src/world_entities/weapons
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/weapons/weapon.cc
r6700 r6728 126 126 } 127 127 128 128 129 /** 129 130 * sets the Projectile to use for this weapon. … … 156 157 } 157 158 159 158 160 /** 159 161 * @see bool Weapon::setProjectile(ClassID projectile) … … 175 177 } 176 178 179 177 180 /** 178 181 * prepares Projectiles of the Weapon … … 186 189 PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName()); 187 190 } 191 188 192 189 193 /** … … 218 222 this->emissionPoint.setRelCoor(point); 219 223 } 224 220 225 221 226 /** … … 247 252 } 248 253 254 249 255 /** 250 256 * creates/returns an Animation3D for a certain State. … … 325 331 } 326 332 333 327 334 /** 328 335 * adds energy to the Weapon … … 345 352 } 346 353 } 354 347 355 348 356 //////////////////////////////////////////////////////////// … … 519 527 this->animation[state]->replay(); 520 528 521 this->stateDuration = this->times[state] + this->stateDuration;529 this->stateDuration += this->times[state]; 522 530 this->currentState = state; 523 531 } -
trunk/src/world_entities/weapons/weapon_manager.cc
r6714 r6728 272 272 this->parent->addChild(weapon); 273 273 } 274 if(configID == this->currentConfigID) 275 this->currentSlotConfig[slotID].nextWeapon = weapon; 274 276 PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassName(), weapon->getName(), configID, slotID); 275 277 return true;
Note: See TracChangeset
for help on using the changeset viewer.