Repositories / curblaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78f4110)
End of level music, possible rrant pod fix
authorlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 25 Aug 2009 19:33:13 +0000 (19:33 +0000)
committerlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 25 Aug 2009 19:33:13 +0000 (19:33 +0000)
git-svn-id: svn+ssh://svn/var/repos/curfender@863 bc5cbbab-a4ec-0310-bb52-ff3d296db539

data/level_end.ogg [new file with mode: 0644] patch | blob
main.cpp patch | blob | blame | history
motion.cpp patch | blob | blame | history

diff --git a/data/level_end.ogg b/data/level_end.ogg
new file mode 100644 (file)
index 0000000..6795ae2
Binary files /dev/null and b/data/level_end.ogg differ
diff --git a/main.cpp b/main.cpp
index 2f0307c..33c3e6a 100644 (file)
--- 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 (file)
--- 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)){
Fork of https://codeberg.org/gwync/curblaster.git with improvements