No commit message

data/credits.dat

@@ -58,44 +58,43 @@
 220 220 220 #
 200 200 0 Music from Open Game Art
 200 200 0 http://opengameart.org
-220 220 220 #
 220 220 220 Mystical Caverns
 220 220 220 by MichaelTheCrow
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Battle in the winter
+220 220 220 Battle in the winter (re-encoded to Ogg Vorbis)
 220 220 220 by Johan Brodd
 220 220 220 GPL 3.0
 220 220 220 #
-220 220 220 Lazy Day
+220 220 220 Lazy Day (re-encoded to Ogg Vorbis)
 220 220 220 by FoxSynergy
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Devilish design
+220 220 220 Devilish design (re-encoded to Ogg Vorbis)
 220 220 220 by Johan Brodd
 220 220 220 GPL 3.0
 220 220 220 #
-220 220 220 Steeps of Destiny
+220 220 220 Steeps of Destiny (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Ruinous Laments
+220 220 220 Ruinous Laments (re-encoded to Ogg Vorbis)
 220 220 220 by Eliot Corley
 220 220 220 CC BY-SA 3.0
 220 220 220 #
-220 220 220 Szymon Matuszewski - Hope
+220 220 220 Szymon Matuszewski - Hope (re-encoded to Ogg Vorbis)
 220 220 220 by Szymon Matuszewski
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Battle Theme
+220 220 220 Battle Theme (re-encoded to Ogg Vorbis)
 220 220 220 by Zehydra
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Undead Rising
+220 220 220 Undead Rising (re-encoded to Ogg Vorbis)
 220 220 220 by Matthew Pablo
 220 220 220 CC BY-SA 3.0
 220 220 220 #
-220 220 220 Theme Menu
+220 220 220 Theme Menu (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
@@ -111,43 +110,43 @@
 220 220 220 by grindhold and grindhold.de
 220 220 220 CC BY-SA 3.0
 220 220 220 #
-220 220 220 So, let see, what you can
+220 220 220 So, let see, what you can (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Without
+220 220 220 Without (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Red Curtain
+220 220 220 Red Curtain (re-encoded to Ogg Vorbis)
 220 220 220 by HorrorPen
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Fight Them Until We Can't
+220 220 220 Fight Them Until We Can't (re-encoded to Ogg Vorbis)
 220 220 220 by Zander Noriega
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Decision
+220 220 220 Decision (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Heroic Minority
+220 220 220 Heroic Minority (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Mystical Theme
+220 220 220 Mystical Theme (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 A winter tale
+220 220 220 A winter tale (re-encoded to Ogg Vorbis)
 220 220 220 by Johan Brodd
 220 220 220 GPL 3.0
 220 220 220 #
-220 220 220 Medicine
+220 220 220 Medicine (re-encoded to Ogg Vorbis)
 220 220 220 by Johan Brodd
 220 220 220 GPL 3.0
 220 220 220 #
-220 220 220 Heroes Theme
+220 220 220 Heroes Theme (re-encoded to Ogg Vorbis)
 220 220 220 by Alexandr Zhelanov
 220 220 220 CC BY 3.0
 220 220 220 #
@@ -589,7 +588,7 @@
 220 220 220 by NenadSimic
 220 220 220 CC BY 3.0
 220 220 220 #
-220 220 220 Fuse igniting and burning (imitated) (as /sound/item/fuse)
+220 220 220 Fuse igniting and burning (imitated) (as sound/item/fuse)
 220 220 220 by Hoscalegeek
 220 220 220 CC0
 220 220 220 #
@@ -599,4 +598,8 @@
 220 220 220 #
 220 220 220 door close 2 (as sound/item/trap_close)
 220 220 220 by THE_bizniss
+220 220 220 CC BY 3.0
+220 220 220 #
+220 220 220 13 Ambient Machine Sounds (as sound/common/mine_lift)
+220 220 220 by Michael Brigida and students
 220 220 220 CC BY 3.0

doc/changes

@@ -1,8 +1,12 @@
 CHANGE LOG
 ----------
 
+Version 1.12
+* Added a sound effect for the lifts
+* Converted mp3s to oggs
+
 Version 1.11
-* Menus now work correctly with analog controls
+* Menus now work correctly with analogue controls
 * Fixed some music files failing to load on Windows
 
 Version 1.10

doc/music_and_sound_licences

@@ -5,39 +5,39 @@ Mystical Caverns
 by MichaelTheCrow
 CC BY 3.0
 
-Battle in the winter
+Battle in the winter (re-encoded to Ogg Vorbis)
 by Johan Brodd
 GPL 3.0
 
-Lazy Day
+Lazy Day (re-encoded to Ogg Vorbis)
 by FoxSynergy
 CC BY 3.0
 
-Devilish design
+Devilish design (re-encoded to Ogg Vorbis)
 by Johan Brodd
 GPL 3.0
 
-Steeps of Destiny
+Steeps of Destiny (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-Ruinous Laments
+Ruinous Laments (re-encoded to Ogg Vorbis)
 by Eliot Corley
 CC BY-SA 3.0
 
-Szymon Matuszewski - Hope
+Szymon Matuszewski - Hope (re-encoded to Ogg Vorbis)
 by Szymon Matuszewski
 CC BY 3.0
 
-Battle Theme
+Battle Theme (re-encoded to Ogg Vorbis)
 by Zehydra
 CC BY 3.0
 
-Undead Rising
+Undead Rising (re-encoded to Ogg Vorbis)
 by Matthew Pablo
 CC BY-SA 3.0
 
-Theme Menu
+Theme Menu (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
@@ -53,43 +53,43 @@ Beauty of Chaos
 by grindhold and grindhold.de
 CC BY-SA 3.0
 
-So, let see, what you can
+So, let see, what you can (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-Without
+Without (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-Red Curtain
+Red Curtain (re-encoded to Ogg Vorbis)
 by HorrorPen
 CC BY 3.0
 
-Fight Them Until We Can't
+Fight Them Until We Can't (re-encoded to Ogg Vorbis)
 by Zander Noriega
 CC BY 3.0
 
-Decision
+Decision (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-Heroic Minority
+Heroic Minority (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-Mystical Theme
+Mystical Theme (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
-A winter tale
+A winter tale (re-encoded to Ogg Vorbis)
 by Johan Brodd
 GPL 3.0
 
-Medicine
+Medicine (re-encoded to Ogg Vorbis)
 by Johan Brodd
 GPL 3.0
 
-Heroes Theme
+Heroes Theme (re-encoded to Ogg Vorbis)
 by Alexandr Zhelanov
 CC BY 3.0
 
@@ -531,7 +531,7 @@ Picked Coin Echo 2 (as sound/common/trophy)
 by NenadSimic
 CC BY 3.0
 
-Fuse igniting and burning (imitated) (as /sound/item/fuse)
+Fuse igniting and burning (imitated) (as sound/item/fuse)
 by Hoscalegeek
 CC0
 
@@ -541,4 +541,8 @@ CC BY 3.0
 
 door close 2 (as sound/item/trap_close)
 by THE_bizniss
+CC BY 3.0
+
+13 Ambient Machine Sounds (as sound/common/mine_lift)
+by Michael Brigida and students
 CC BY 3.0

doc/readme

@@ -1,6 +1,6 @@
 The Legend of Edgar
 
-Version 1.11
+Version 1.12
 
 LICENSE
 

makefile

@@ -1,4 +1,4 @@
-VERSION = 1.11
+VERSION = 1.12
 RELEASE = 1
 DEV = 0
 PAK_FILE = edgar.pak

makefile.amiga

@@ -1,4 +1,4 @@
-VERSION = 1.11
+VERSION = 1.12
 RELEASE = 1
 DEV = 0
 PAK_FILE = edgar.pak

makefile.aros

@@ -1,4 +1,4 @@
-VERSION = 1.11
+VERSION = 1.12
 RELEASE = 1
 DEV = 0
 PAK_FILE = edgar.pak

makefile.windows

@@ -1,4 +1,4 @@
-VERSION = 1.11
+VERSION = 1.12
 RELEASE = 1
 DEV = 0
 PAK_FILE = edgar.pak

src/audio/music.c

@@ -70,40 +70,40 @@ static char *oldMusicTracks[] = {
 };
 
 static char *newMusicTracks[] = {
-			"TITLE_MUSIC", "music/Menu_loop.mp3",
-			"MAP01_MUSIC", "music/Lazy Day v0_9.mp3",
-			"MAP02_MUSIC", "music/Ruinous Laments(5.6).mp3",
-			"MAP03_MUSIC", "music/Devilish design.mp3",
+			"TITLE_MUSIC", "music/Menu_loop.ogg",
+			"MAP01_MUSIC", "music/Lazy Day v0_9.ogg",
+			"MAP02_MUSIC", "music/Ruinous Laments(5.6).ogg",
+			"MAP03_MUSIC", "music/Devilish design.ogg",
 			"MAP04_MUSIC", "music/Avgvst - Mushrooms_1.ogg",
 			"MAP05_MUSIC", "music/MysticalCaverns.ogg",
-			"MAP06_MUSIC", "music/Red Curtain.mp3",
+			"MAP06_MUSIC", "music/Red Curtain.ogg",
 			"MAP07_MUSIC", "music/ratsrats_0.ogg",
 			"MAP08_MUSIC", "music/beauty_of_chaos.ogg",
-			"MAP09_MUSIC", "music/Battle in the winter.mp3",
-			"MAP10_MUSIC", "music/Devilish design.mp3",
-			"MAP11_MUSIC", "music/Decision.mp3",
-			"MAP12_MUSIC", "music/Ruinous Laments(5.6).mp3",
-			"MAP13_MUSIC", "music/Heroic Minority.mp3",
+			"MAP09_MUSIC", "music/Battle in the winter.ogg",
+			"MAP10_MUSIC", "music/Devilish design.ogg",
+			"MAP11_MUSIC", "music/Decision.ogg",
+			"MAP12_MUSIC", "music/Ruinous Laments(5.6).ogg",
+			"MAP13_MUSIC", "music/Heroic Minority.ogg",
 			"MAP14_MUSIC", "NO_MUSIC",
-			"MAP15_MUSIC", "music/Mystical Theme.mp3",
-			"MAP16_MUSIC", "music/Battle.mp3",
-			"MAP17_MUSIC", "music/Szymon Matuszewski - Hope.mp3",
-			"MAP18_MUSIC", "music/A wintertale_0.mp3",
+			"MAP15_MUSIC", "music/Mystical Theme.ogg",
+			"MAP16_MUSIC", "music/Battle.ogg",
+			"MAP17_MUSIC", "music/Szymon Matuszewski - Hope.ogg",
+			"MAP18_MUSIC", "music/A wintertale_0.ogg",
 			"MAP19_MUSIC", "music/MysticalCaverns.ogg",
-			"MAP20_MUSIC", "music/Steeps of Destiny.mp3",
-			"MAP21_MUSIC", "music/Medicine.mp3",
-			"MAP22_MUSIC", "music/Decision.mp3",
-			"MAP23_MUSIC", "music/Heroic Minority.mp3",
-			"MAP24_MUSIC", "music/Battle.mp3",
-			"MAP25_MUSIC", "music/Medicine.mp3",
-			"MAP26_MUSIC", "music/Undead Rising.mp3",
-			"TUTORIAL_MUSIC", "music/Lazy Day v0_9.mp3",
-			"CREDITS_MUSIC", "music/Heroes Theme_0.mp3",
-			"GAMEOVER_MUSIC", "music/Without.mp3",
-			"BOSS_MUSIC", "music/So, let see, what you can_0.mp3",
-			"EVIL_EDGAR_MUSIC", "music/So, let see, what you can_0.mp3",
-			"SORCEROR_MUSIC", "music/Zander Noriega - Fight Them Until We Cant.mp3",
-			"REUNION_MUSIC", "music/Lazy Day v0_9.mp3"
+			"MAP20_MUSIC", "music/Steeps of Destiny.ogg",
+			"MAP21_MUSIC", "music/Medicine.ogg",
+			"MAP22_MUSIC", "music/Decision.ogg",
+			"MAP23_MUSIC", "music/Heroic Minority.ogg",
+			"MAP24_MUSIC", "music/Battle.ogg",
+			"MAP25_MUSIC", "music/Medicine.ogg",
+			"MAP26_MUSIC", "music/Undead Rising.ogg",
+			"TUTORIAL_MUSIC", "music/Lazy Day v0_9.ogg",
+			"CREDITS_MUSIC", "music/Heroes Theme_0.ogg",
+			"GAMEOVER_MUSIC", "music/Without.ogg",
+			"BOSS_MUSIC", "music/So, let see, what you can_0.ogg",
+			"EVIL_EDGAR_MUSIC", "music/So, let see, what you can_0.ogg",
+			"SORCEROR_MUSIC", "music/Zander Noriega - Fight Them Until We Cant.ogg",
+			"REUNION_MUSIC", "music/Lazy Day v0_9.ogg"
 };
 static int musicTracksLength = sizeof(newMusicTracks) / sizeof(char *);
 

src/world/lift.c

@@ -209,7 +209,7 @@ static void findTarget(int val)
 
 				self->action = &moveToTarget;
 
-				playSoundToMap("sound/common/mine_lift", -1, self->x, self->y, 0);
+				self->mental = playSoundToMap("sound/common/mine_lift", -1, self->x, self->y, 0);
 			}
 		}
 
@@ -269,6 +269,8 @@ static void moveToTarget()
 
 			else
 			{
+				stopSound(self->mental);
+
 				self->action = &entityWait;
 			}
 		}