Changeset 4967 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 28, 2005, 9:24:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: multiple sounds on the turret
this does not really work, as openAL is only really able to play back one effect on a SoundSource, this is rather silly…. check it out …

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (1 diff)
• world_entities/weapons/weapon.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -963 +963 @@
 
   SoundEngine::getInstance()->update();
-  music->update();
+//  music->update();
 }
 

orxonox/trunk/src/world_entities/player.cc

@@ -89 +89 @@
   this->weaponMan->addWeapon(wpLeft, 1, 0);
   this->weaponMan->addWeapon(wpRight,1 ,1);
+  this->weaponMan->addWeapon(turret, 2, 2);
   this->weaponMan->addWeapon(turret, 3, 2);
+  this->weaponMan->addWeapon(wpLeft, 3, 0);
+  this->weaponMan->addWeapon(wpRight,3 ,1);
 
   this->weaponMan->changeWeaponConfig(0);

orxonox/trunk/src/world_entities/weapons/turret.cc

@@ -65 +65 @@
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
   this->setProjectile(CL_TEST_BULLET);

orxonox/trunk/src/world_entities/weapons/weapon.cc

@@ -164 +164 @@
     if (this->soundBuffers[action] != NULL)
     {
-      PRINTF(4)("Loaded sound %s to action %s\n", soundFile, actionToChar(action));
+      PRINTF(4)("Loaded sound %s to action %s.\n", soundFile, actionToChar(action));
     }
     else
     {
-      PRINTF(4)("failed to load sound %s to %s\n", soundFile, actionToChar(action));
+      PRINTF(4)("Failed to load sound %s to %s.\n.", soundFile, actionToChar(action));
     }
   }
@@ -508 +508 @@
   PRINT(3)("Energy: max: %f; current: %f;  loadedMax: %f; loadedCurrent: %f; chargeMin: %f, chargeMax %f\n",
             this->energyMax, this->energy, this->energyLoadedMax, this->energyLoaded, this->minCharge, this->maxCharge);
+
+
 }