- Timestamp:
- Jul 28, 2005, 9:24:18 PM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/story_entities/world.cc
r4961 r4967 963 963 964 964 SoundEngine::getInstance()->update(); 965 music->update();965 // music->update(); 966 966 } 967 967 -
orxonox/trunk/src/world_entities/player.cc
r4964 r4967 89 89 this->weaponMan->addWeapon(wpLeft, 1, 0); 90 90 this->weaponMan->addWeapon(wpRight,1 ,1); 91 this->weaponMan->addWeapon(turret, 2, 2); 91 92 this->weaponMan->addWeapon(turret, 3, 2); 93 this->weaponMan->addWeapon(wpLeft, 3, 0); 94 this->weaponMan->addWeapon(wpRight,3 ,1); 92 95 93 96 this->weaponMan->changeWeaponConfig(0); -
orxonox/trunk/src/world_entities/weapons/turret.cc
r4966 r4967 65 65 66 66 this->setActionSound(WA_SHOOT, "sound/shot1.wav"); 67 this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav"); 68 this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav"); 67 69 68 70 this->setProjectile(CL_TEST_BULLET); -
orxonox/trunk/src/world_entities/weapons/weapon.cc
r4959 r4967 164 164 if (this->soundBuffers[action] != NULL) 165 165 { 166 PRINTF(4)("Loaded sound %s to action %s \n", soundFile, actionToChar(action));166 PRINTF(4)("Loaded sound %s to action %s.\n", soundFile, actionToChar(action)); 167 167 } 168 168 else 169 169 { 170 PRINTF(4)(" failed to load sound %s to %s\n", soundFile, actionToChar(action));170 PRINTF(4)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action)); 171 171 } 172 172 } … … 508 508 PRINT(3)("Energy: max: %f; current: %f; loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n", 509 509 this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge); 510 511 510 512 } 511 513
Note: See TracChangeset
for help on using the changeset viewer.