From 2c334664bd55db4921af4d64dc39409622af0872 Mon Sep 17 00:00:00 2001 From: limb Date: Tue, 25 Aug 2009 19:33:13 +0000 Subject: [PATCH] End of level music, possible rrant pod fix git-svn-id: svn+ssh://svn/var/repos/curfender@863 bc5cbbab-a4ec-0310-bb52-ff3d296db539 --- data/level_end.ogg | Bin 0 -> 6410 bytes main.cpp | 6 ++++++ motion.cpp | 5 +++++ 3 files changed, 11 insertions(+) create mode 100644 data/level_end.ogg diff --git a/data/level_end.ogg b/data/level_end.ogg new file mode 100644 index 0000000000000000000000000000000000000000..6795ae203c0f3d9e3bb64504561cfe188fd138bd GIT binary patch literal 6410 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 literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 2f0307c..33c3e6a 100644 --- a/main.cpp +++ b/main.cpp @@ -575,6 +575,8 @@ int main(int argc, char *argv[]){ int enshotchannel = -1; Mix_Chunk *missilesound = NULL; int missilechannel = -1; + Mix_Chunk *levelendsound = NULL; + int levelendchannel = -1; Mix_Music *title = NULL; @@ -611,6 +613,7 @@ int main(int argc, char *argv[]){ crazifysound = Mix_LoadWAV("data/crazify.ogg"); enshotsound = Mix_LoadWAV("data/enshot.ogg"); missilesound = Mix_LoadWAV("data/missile.ogg"); + levelendsound = Mix_LoadWAV("data/level_end.ogg"); title = Mix_LoadMUS("data/title_music.ogg"); } else { @@ -627,6 +630,7 @@ int main(int argc, char *argv[]){ crazifysound = Mix_LoadWAV("/usr/share/curfender/data/crazify.ogg"); enshotsound = Mix_LoadWAV("/usr/share/curfender/data/enshot.ogg"); missilesound = Mix_LoadWAV("/usr/share/curfender/data/missile.ogg"); + levelendsound = Mix_LoadWAV("/usr/share/curfender/data/level_end.ogg"); title = Mix_LoadMUS("/usr/share/curfender/data/title_music.ogg"); } @@ -1601,6 +1605,7 @@ int main(int argc, char *argv[]){ bosscount = 0; for(int bossloop = 0; bossloop<6; bossloop++){ bosscount = bosscount + bosses[bossloop].active; }; if(landercount<=0&&bosscount<=0){ + levelendchannel = play_sound_effect(levelendsound); //Tally bonuses //Award lives, if any if(lives<4){lives++;}; @@ -1703,6 +1708,7 @@ int main(int argc, char *argv[]){ Mix_FreeChunk(crazifysound); Mix_FreeChunk(enshotsound); Mix_FreeChunk(missilesound); + Mix_FreeChunk(levelendsound); //no need to free title music, done after title. diff --git a/motion.cpp b/motion.cpp index 9691554..e33bcfc 100644 --- a/motion.cpp +++ b/motion.cpp @@ -228,6 +228,11 @@ game_object process_motion(game_object object, game_object player){ }else{ object.face=0; }; + if(object.active==1){ + //possible pod out of bounds fix hack + if(object.x>18){object.x=18;}; + if(object.x<2){object.x=2;}; + }; }; if((object.number>=11)&&(object.number<=13)){ -- 2.9.0