Skip to content
This repository
Browse code

Ogg files are now played by allegro

  • Loading branch information...
commit a083ea9031e21395565092860528c8ca0dd29d1e 1 parent b080eeb
Stanisław Gackowski soeb authored

Showing 37 changed files with 22 additions and 22 deletions. Show diff stats Hide diff stats

  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.wav
  8. BIN  out/sfx/death.wav
  9. BIN  out/sfx/dragon_ambience.wav
  10. BIN  out/sfx/dragon_ambient_aggro.wav
  11. BIN  out/sfx/dragon_ambient_passive.wav
  12. BIN  out/sfx/dragon_death.wav
  13. BIN  out/sfx/dragon_pain.wav
  14. BIN  out/sfx/dragon_roar_1.wav
  15. BIN  out/sfx/dragon_roar_1_sharp.wav
  16. BIN  out/sfx/dragon_roar_2.wav
  17. BIN  out/sfx/dragon_roar_2_sharp.wav
  18. BIN  out/sfx/enemy_death.wav
  19. BIN  out/sfx/enemy_pain.wav
  20. BIN  out/sfx/enemy_skate.wav
  21. BIN  out/sfx/gun.wav
  22. BIN  out/sfx/pain1.wav
  23. BIN  out/sfx/pain2.wav
  24. BIN  out/sfx/pain3.wav
  25. BIN  out/sfx/pickup.wav
  26. BIN  out/sfx/pickup2.wav
  27. BIN  out/sfx/pickup3.wav
  28. BIN  out/sfx/pickup_spawn.wav
  29. BIN  out/sfx/shotgun.wav
  30. BIN  out/sfx/skate.wav
  31. BIN  out/sfx/smg.wav
  32. BIN  out/sfx/zap_2.wav
  33. +3 3 src/AudioManager.cpp
  34. +4 4 src/Character.cpp
  35. +5 5 src/DragonHead.cpp
  36. +1 1  src/Pickup.cpp
  37. +9 9 src/Player.cpp
BIN  out/music/combat.ogg
Binary file not shown
BIN  out/music/combat.wav
Binary file not shown
BIN  out/music/dragon.ogg
Binary file not shown
BIN  out/music/dragon.wav
Binary file not shown
BIN  out/music/normal.ogg
Binary file not shown
BIN  out/music/normal.wav
Binary file not shown
BIN  out/sfx/damage_fail.wav
Binary file not shown
BIN  out/sfx/death.wav
Binary file not shown
BIN  out/sfx/dragon_ambience.wav
Binary file not shown
BIN  out/sfx/dragon_ambient_aggro.wav
Binary file not shown
BIN  out/sfx/dragon_ambient_passive.wav
Binary file not shown
BIN  out/sfx/dragon_death.wav
Binary file not shown
BIN  out/sfx/dragon_pain.wav
Binary file not shown
BIN  out/sfx/dragon_roar_1.wav
Binary file not shown
BIN  out/sfx/dragon_roar_1_sharp.wav
Binary file not shown
BIN  out/sfx/dragon_roar_2.wav
Binary file not shown
BIN  out/sfx/dragon_roar_2_sharp.wav
Binary file not shown
BIN  out/sfx/enemy_death.wav
Binary file not shown
BIN  out/sfx/enemy_pain.wav
Binary file not shown
BIN  out/sfx/enemy_skate.wav
Binary file not shown
BIN  out/sfx/gun.wav
Binary file not shown
BIN  out/sfx/pain1.wav
Binary file not shown
BIN  out/sfx/pain2.wav
Binary file not shown
BIN  out/sfx/pain3.wav
Binary file not shown
BIN  out/sfx/pickup.wav
Binary file not shown
BIN  out/sfx/pickup2.wav
Binary file not shown
BIN  out/sfx/pickup3.wav
Binary file not shown
BIN  out/sfx/pickup_spawn.wav
Binary file not shown
BIN  out/sfx/shotgun.wav
Binary file not shown
BIN  out/sfx/skate.wav
Binary file not shown
BIN  out/sfx/smg.wav
Binary file not shown
BIN  out/sfx/zap_2.wav
Binary file not shown
6 src/AudioManager.cpp
@@ -28,9 +28,9 @@ AudioManager::AudioManager()
28 28
29 29 currentSample = new ALLEGRO_SAMPLE_ID();
30 30
31   - normalMusic = al_load_sample("music/normal.wav");
32   - combatMusic = al_load_sample("music/combat.wav");
33   - dragonMusic = al_load_sample("music/dragon.wav");
  31 + normalMusic = al_load_sample("music/normal.ogg");
  32 + combatMusic = al_load_sample("music/combat.ogg");
  33 + dragonMusic = al_load_sample("music/dragon.ogg");
34 34
35 35 //ctor
36 36 }
8 src/Character.cpp
@@ -24,10 +24,10 @@ along with FLAT. If not, see <http://www.gnu.org/licenses/>.
24 24 Character::Character()
25 25 {
26 26
27   - fireSample = al_load_sample("sfx/zap_2.wav");
28   - skateSample = al_load_sample("sfx/enemy_skate.wav");
29   - painSample = al_load_sample("sfx/enemy_pain.wav");
30   - deathSample = al_load_sample("sfx/enemy_death.wav");
  27 + fireSample = al_load_sample("sfx/zap_2.ogg");
  28 + skateSample = al_load_sample("sfx/enemy_skate.ogg");
  29 + painSample = al_load_sample("sfx/enemy_pain.ogg");
  30 + deathSample = al_load_sample("sfx/enemy_death.ogg");
31 31
32 32 dragon = false;
33 33
10 src/DragonHead.cpp
@@ -25,11 +25,11 @@ DragonHead::DragonHead() {}
25 25
26 26 DragonHead::DragonHead(DrawStack3D* world3D, vector <Character*> *npc)
27 27 {
28   - roar1 = al_load_sample("sfx/dragon_roar_2.wav");
29   - roar2 = al_load_sample("sfx/dragon_roar_1.wav");
30   - deathSample = al_load_sample("sfx/dragon_death.wav");
31   - painSample = al_load_sample("sfx/dragon_pain.wav");
32   - ambience = al_load_sample("sfx/dragon_ambience.wav");
  28 + roar1 = al_load_sample("sfx/dragon_roar_2.ogg");
  29 + roar2 = al_load_sample("sfx/dragon_roar_1.ogg");
  30 + deathSample = al_load_sample("sfx/dragon_death.ogg");
  31 + painSample = al_load_sample("sfx/dragon_pain.ogg");
  32 + ambience = al_load_sample("sfx/dragon_ambience.ogg");
33 33
34 34 splashEnd = al_load_bitmap("gfx/splash_end.png");
35 35
2  src/Pickup.cpp
@@ -58,7 +58,7 @@ Pickup::Pickup(DrawStack3D* world3D, vec3 _position) {
58 58 setPrescale(5.0f);
59 59
60 60 //Start playing the hum silently. We'll increase its volume as we get closer.
61   - humSample = al_load_sample("sfx/pickup_spawn.wav");
  61 + humSample = al_load_sample("sfx/pickup_spawn.ogg");
62 62 al_play_sample(humSample, 1.0f, 0.0f, 1.0f, ALLEGRO_PLAYMODE_ONCE, NULL);
63 63 }
64 64
18 src/Player.cpp
@@ -33,12 +33,12 @@ Player::Player()
33 33
34 34 healthBitmap = al_load_bitmap("gfx/health.png");
35 35
36   - skateSound = al_load_sample("sfx/skate.wav");
37   - painSounds[0] = al_load_sample("sfx/pain1.wav");
38   - painSounds[1] = al_load_sample("sfx/pain2.wav");
39   - painSounds[2] = al_load_sample("sfx/pain3.wav");
40   - deathSound = al_load_sample("sfx/death.wav");
41   - pickupSound = al_load_sample("sfx/pickup.wav");
  36 + skateSound = al_load_sample("sfx/skate.ogg");
  37 + painSounds[0] = al_load_sample("sfx/pain1.ogg");
  38 + painSounds[1] = al_load_sample("sfx/pain2.ogg");
  39 + painSounds[2] = al_load_sample("sfx/pain3.ogg");
  40 + deathSound = al_load_sample("sfx/death.ogg");
  41 + pickupSound = al_load_sample("sfx/pickup.ogg");
42 42
43 43 lastDir = 0;
44 44
@@ -69,7 +69,7 @@ Player::Player()
69 69 //Setup Weapons:
70 70
71 71 //PISTOL
72   - pistol = Weapon("gfx/gun.png", "sfx/gun.wav");
  72 + pistol = Weapon("gfx/gun.png", "sfx/gun.ogg");
73 73
74 74 pistol.automatic = false;
75 75
@@ -100,7 +100,7 @@ Player::Player()
100 100
101 101
102 102 //SHOTGUN
103   - shotgun = Weapon("gfx/shotgun.png", "sfx/shotgun.wav");
  103 + shotgun = Weapon("gfx/shotgun.png", "sfx/shotgun.ogg");
104 104
105 105 shotgun.automatic = true;
106 106
@@ -131,7 +131,7 @@ Player::Player()
131 131
132 132
133 133 //SMG
134   - smg = Weapon("gfx/smg.png", "sfx/smg.wav");
  134 + smg = Weapon("gfx/smg.png", "sfx/smg.ogg");
135 135
136 136 smg.automatic = true;
137 137

0 comments on commit a083ea9

Please sign in to comment.
Something went wrong with that request. Please try again.