Permalink
Browse files

Merge pull request #34 from soeb/master

"Fixed" bug #29
  • Loading branch information...
2 parents dc04b96 + 1276a3c commit 1f4b252ce39166da534d2383f257000ca29db86a @Cheeseness committed Jan 30, 2013
Showing with 22 additions and 22 deletions.
  1. BIN out/music/combat.ogg
  2. BIN out/music/combat.wav
  3. BIN out/music/dragon.ogg
  4. BIN out/music/dragon.wav
  5. BIN out/music/normal.ogg
  6. BIN out/music/normal.wav
  7. BIN out/sfx/damage_fail.ogg
  8. BIN out/sfx/damage_fail.wav
  9. BIN out/sfx/death.ogg
  10. BIN out/sfx/death.wav
  11. BIN out/sfx/dragon_ambience.ogg
  12. BIN out/sfx/dragon_ambience.wav
  13. BIN out/sfx/dragon_ambient_aggro.ogg
  14. BIN out/sfx/dragon_ambient_aggro.wav
  15. BIN out/sfx/dragon_ambient_passive.ogg
  16. BIN out/sfx/dragon_ambient_passive.wav
  17. BIN out/sfx/dragon_death.ogg
  18. BIN out/sfx/dragon_death.wav
  19. BIN out/sfx/dragon_pain.ogg
  20. BIN out/sfx/dragon_pain.wav
  21. BIN out/sfx/dragon_roar_1.ogg
  22. BIN out/sfx/dragon_roar_1.wav
  23. BIN out/sfx/dragon_roar_1_sharp.ogg
  24. BIN out/sfx/dragon_roar_1_sharp.wav
  25. BIN out/sfx/dragon_roar_2.ogg
  26. BIN out/sfx/dragon_roar_2.wav
  27. BIN out/sfx/dragon_roar_2_sharp.ogg
  28. BIN out/sfx/dragon_roar_2_sharp.wav
  29. BIN out/sfx/enemy_death.ogg
  30. BIN out/sfx/enemy_death.wav
  31. BIN out/sfx/enemy_pain.ogg
  32. BIN out/sfx/enemy_pain.wav
  33. BIN out/sfx/enemy_skate.ogg
  34. BIN out/sfx/enemy_skate.wav
  35. BIN out/sfx/gun.ogg
  36. BIN out/sfx/gun.wav
  37. BIN out/sfx/pain1.ogg
  38. BIN out/sfx/pain1.wav
  39. BIN out/sfx/pain2.ogg
  40. BIN out/sfx/pain2.wav
  41. BIN out/sfx/pain3.ogg
  42. BIN out/sfx/pain3.wav
  43. BIN out/sfx/pickup.ogg
  44. BIN out/sfx/pickup.wav
  45. BIN out/sfx/pickup2.ogg
  46. BIN out/sfx/pickup2.wav
  47. BIN out/sfx/pickup3.ogg
  48. BIN out/sfx/pickup3.wav
  49. BIN out/sfx/pickup_spawn.ogg
  50. BIN out/sfx/pickup_spawn.wav
  51. BIN out/sfx/shotgun.ogg
  52. BIN out/sfx/shotgun.wav
  53. BIN out/sfx/skate.ogg
  54. BIN out/sfx/skate.wav
  55. BIN out/sfx/smg.ogg
  56. BIN out/sfx/smg.wav
  57. BIN out/sfx/zap_2.ogg
  58. BIN out/sfx/zap_2.wav
  59. +3 −3 src/AudioManager.cpp
  60. +4 −4 src/Character.cpp
  61. +5 −5 src/DragonHead.cpp
  62. +1 −1 src/Pickup.cpp
  63. +9 −9 src/Player.cpp
View
BIN out/music/combat.ogg
Binary file not shown.
View
BIN out/music/combat.wav
Binary file not shown.
View
BIN out/music/dragon.ogg
Binary file not shown.
View
BIN out/music/dragon.wav
Binary file not shown.
View
BIN out/music/normal.ogg
Binary file not shown.
View
BIN out/music/normal.wav
Binary file not shown.
View
BIN out/sfx/damage_fail.ogg
Binary file not shown.
View
BIN out/sfx/damage_fail.wav
Binary file not shown.
View
BIN out/sfx/death.ogg
Binary file not shown.
View
BIN out/sfx/death.wav
Binary file not shown.
View
BIN out/sfx/dragon_ambience.ogg
Binary file not shown.
View
BIN out/sfx/dragon_ambience.wav
Binary file not shown.
View
BIN out/sfx/dragon_ambient_aggro.ogg
Binary file not shown.
View
BIN out/sfx/dragon_ambient_aggro.wav
Binary file not shown.
View
BIN out/sfx/dragon_ambient_passive.ogg
Binary file not shown.
View
BIN out/sfx/dragon_ambient_passive.wav
Binary file not shown.
View
BIN out/sfx/dragon_death.ogg
Binary file not shown.
View
BIN out/sfx/dragon_death.wav
Binary file not shown.
View
BIN out/sfx/dragon_pain.ogg
Binary file not shown.
View
BIN out/sfx/dragon_pain.wav
Binary file not shown.
View
BIN out/sfx/dragon_roar_1.ogg
Binary file not shown.
View
BIN out/sfx/dragon_roar_1.wav
Binary file not shown.
View
BIN out/sfx/dragon_roar_1_sharp.ogg
Binary file not shown.
View
BIN out/sfx/dragon_roar_1_sharp.wav
Binary file not shown.
View
BIN out/sfx/dragon_roar_2.ogg
Binary file not shown.
View
BIN out/sfx/dragon_roar_2.wav
Binary file not shown.
View
BIN out/sfx/dragon_roar_2_sharp.ogg
Binary file not shown.
View
BIN out/sfx/dragon_roar_2_sharp.wav
Binary file not shown.
View
BIN out/sfx/enemy_death.ogg
Binary file not shown.
View
BIN out/sfx/enemy_death.wav
Binary file not shown.
View
BIN out/sfx/enemy_pain.ogg
Binary file not shown.
View
BIN out/sfx/enemy_pain.wav
Binary file not shown.
View
BIN out/sfx/enemy_skate.ogg
Binary file not shown.
View
BIN out/sfx/enemy_skate.wav
Binary file not shown.
View
BIN out/sfx/gun.ogg
Binary file not shown.
View
BIN out/sfx/gun.wav
Binary file not shown.
View
BIN out/sfx/pain1.ogg
Binary file not shown.
View
BIN out/sfx/pain1.wav
Binary file not shown.
View
BIN out/sfx/pain2.ogg
Binary file not shown.
View
BIN out/sfx/pain2.wav
Binary file not shown.
View
BIN out/sfx/pain3.ogg
Binary file not shown.
View
BIN out/sfx/pain3.wav
Binary file not shown.
View
BIN out/sfx/pickup.ogg
Binary file not shown.
View
BIN out/sfx/pickup.wav
Binary file not shown.
View
BIN out/sfx/pickup2.ogg
Binary file not shown.
View
BIN out/sfx/pickup2.wav
Binary file not shown.
View
BIN out/sfx/pickup3.ogg
Binary file not shown.
View
BIN out/sfx/pickup3.wav
Binary file not shown.
View
BIN out/sfx/pickup_spawn.ogg
Binary file not shown.
View
BIN out/sfx/pickup_spawn.wav
Binary file not shown.
View
BIN out/sfx/shotgun.ogg
Binary file not shown.
View
BIN out/sfx/shotgun.wav
Binary file not shown.
View
BIN out/sfx/skate.ogg
Binary file not shown.
View
BIN out/sfx/skate.wav
Binary file not shown.
View
BIN out/sfx/smg.ogg
Binary file not shown.
View
BIN out/sfx/smg.wav
Binary file not shown.
View
BIN out/sfx/zap_2.ogg
Binary file not shown.
View
BIN out/sfx/zap_2.wav
Binary file not shown.
View
6 src/AudioManager.cpp
@@ -28,9 +28,9 @@ AudioManager::AudioManager()
currentSample = new ALLEGRO_SAMPLE_ID();
- normalMusic = al_load_sample("music/normal.wav");
- combatMusic = al_load_sample("music/combat.wav");
- dragonMusic = al_load_sample("music/dragon.wav");
+ normalMusic = al_load_sample("music/normal.ogg");
+ combatMusic = al_load_sample("music/combat.ogg");
+ dragonMusic = al_load_sample("music/dragon.ogg");
//ctor
}
View
8 src/Character.cpp
@@ -24,10 +24,10 @@ along with FLAT. If not, see <http://www.gnu.org/licenses/>.
Character::Character()
{
- fireSample = al_load_sample("sfx/zap_2.wav");
- skateSample = al_load_sample("sfx/enemy_skate.wav");
- painSample = al_load_sample("sfx/enemy_pain.wav");
- deathSample = al_load_sample("sfx/enemy_death.wav");
+ fireSample = al_load_sample("sfx/zap_2.ogg");
+ skateSample = al_load_sample("sfx/enemy_skate.ogg");
+ painSample = al_load_sample("sfx/enemy_pain.ogg");
+ deathSample = al_load_sample("sfx/enemy_death.ogg");
dragon = false;
View
10 src/DragonHead.cpp
@@ -25,11 +25,11 @@ DragonHead::DragonHead() {}
DragonHead::DragonHead(DrawStack3D* world3D, vector <Character*> *npc)
{
- roar1 = al_load_sample("sfx/dragon_roar_2.wav");
- roar2 = al_load_sample("sfx/dragon_roar_1.wav");
- deathSample = al_load_sample("sfx/dragon_death.wav");
- painSample = al_load_sample("sfx/dragon_pain.wav");
- ambience = al_load_sample("sfx/dragon_ambience.wav");
+ roar1 = al_load_sample("sfx/dragon_roar_2.ogg");
+ roar2 = al_load_sample("sfx/dragon_roar_1.ogg");
+ deathSample = al_load_sample("sfx/dragon_death.ogg");
+ painSample = al_load_sample("sfx/dragon_pain.ogg");
+ ambience = al_load_sample("sfx/dragon_ambience.ogg");
splashEnd = al_load_bitmap("gfx/splash_end.png");
View
2 src/Pickup.cpp
@@ -58,7 +58,7 @@ Pickup::Pickup(DrawStack3D* world3D, vec3 _position) {
setPrescale(5.0f);
//Start playing the hum silently. We'll increase its volume as we get closer.
- humSample = al_load_sample("sfx/pickup_spawn.wav");
+ humSample = al_load_sample("sfx/pickup_spawn.ogg");
al_play_sample(humSample, 1.0f, 0.0f, 1.0f, ALLEGRO_PLAYMODE_ONCE, NULL);
}
View
18 src/Player.cpp
@@ -33,12 +33,12 @@ Player::Player()
healthBitmap = al_load_bitmap("gfx/health.png");
- skateSound = al_load_sample("sfx/skate.wav");
- painSounds[0] = al_load_sample("sfx/pain1.wav");
- painSounds[1] = al_load_sample("sfx/pain2.wav");
- painSounds[2] = al_load_sample("sfx/pain3.wav");
- deathSound = al_load_sample("sfx/death.wav");
- pickupSound = al_load_sample("sfx/pickup.wav");
+ skateSound = al_load_sample("sfx/skate.ogg");
+ painSounds[0] = al_load_sample("sfx/pain1.ogg");
+ painSounds[1] = al_load_sample("sfx/pain2.ogg");
+ painSounds[2] = al_load_sample("sfx/pain3.ogg");
+ deathSound = al_load_sample("sfx/death.ogg");
+ pickupSound = al_load_sample("sfx/pickup.ogg");
lastDir = 0;
@@ -69,7 +69,7 @@ Player::Player()
//Setup Weapons:
//PISTOL
- pistol = Weapon("gfx/gun.png", "sfx/gun.wav");
+ pistol = Weapon("gfx/gun.png", "sfx/gun.ogg");
pistol.automatic = false;
@@ -100,7 +100,7 @@ Player::Player()
//SHOTGUN
- shotgun = Weapon("gfx/shotgun.png", "sfx/shotgun.wav");
+ shotgun = Weapon("gfx/shotgun.png", "sfx/shotgun.ogg");
shotgun.automatic = true;
@@ -131,7 +131,7 @@ Player::Player()
//SMG
- smg = Weapon("gfx/smg.png", "sfx/smg.wav");
+ smg = Weapon("gfx/smg.png", "sfx/smg.ogg");
smg.automatic = true;

0 comments on commit 1f4b252

Please sign in to comment.