Changeset 4930 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon.cc
- Timestamp:
- Jul 22, 2005, 2:11:21 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/world_entities/weapons/weapon.cc
r4927 r4930 88 88 89 89 this->energyLoaded = .0; 90 this->energyLoadedMax = 10.0;90 this->energyLoadedMax = 5.0; 91 91 this->energy = .0; 92 this->energyMax = 10 0.0;92 this->energyMax = 10.0; 93 93 } 94 94 … … 112 112 if (action >= WA_ACTION_COUNT) 113 113 return; 114 if (this->soundBuffers[action] != NULL) 115 ResourceManager::getInstance()->unload(this->soundBuffers[action]); 116 114 117 else if (soundFile != NULL) 115 118 { … … 330 333 { 331 334 this->requestAction(WA_RELOAD); 335 this->execute(); 332 336 } 333 337 } … … 344 348 { 345 349 this->requestAction(WA_DEACTIVATE); 350 this->execute(); 346 351 return false; 347 352 }
Note: See TracChangeset
for help on using the changeset viewer.