Repositories / curblaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44c61db)
Integrated new sounds.
authorlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Thu, 28 May 2009 17:30:57 +0000 (17:30 +0000)
committerlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Thu, 28 May 2009 17:30:57 +0000 (17:30 +0000)
git-svn-id: svn+ssh://svn/var/repos/curfender@804 bc5cbbab-a4ec-0310-bb52-ff3d296db539

main.cpp patch | blob | blame | history

diff --git a/main.cpp b/main.cpp
index b91d1bd..7b5ebf4 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1218,6 +1218,14 @@ int main(){
     int shotchannel = -1;
     Mix_Chunk *boomsound = NULL;
     int boomchannel = -1;
+    Mix_Chunk *dropoffsound = NULL;
+    int dropoffchannel = -1;
+    Mix_Chunk *pickupsound = NULL;
+    int pickupchannel = -1;
+    Mix_Chunk *lasersound = NULL;
+    int laserchannel = -1;
+    Mix_Chunk *warningsound = NULL;
+    int warningchannel = -1;
 
     int audio_rate = 22050;
     Uint16 audio_format = AUDIO_S16; 
@@ -1237,6 +1245,10 @@ int main(){
 
       shotsound = Mix_LoadWAV("shot.ogg");
       boomsound = Mix_LoadWAV("boom.ogg");
+      dropoffsound = Mix_LoadWAV("dropoff.ogg");
+      pickupsound = Mix_LoadWAV("pickup.ogg");
+      lasersound = Mix_LoadWAV("laser.ogg");
+      warningsound = Mix_LoadWAV("warning.ogg");
     } else {
       sound = 0;
   }
@@ -1453,12 +1465,14 @@ int main(){
     //alerts
     if(alertright>0){
       if(alertright%2==0){
+        warningchannel = play_sound_effect(warningsound);
        mvprintw(19,50," >> ");
       };
       alertright--;
     };
     if(alertleft>0){
       if(alertleft%2==0){
+        warningchannel = play_sound_effect(warningsound);
        mvprintw(19,40," << ");
       };
       alertleft--;
@@ -1491,6 +1505,10 @@ int main(){
        if(sound==1){
          Mix_FreeChunk(shotsound);
          Mix_FreeChunk(boomsound);
+         Mix_FreeChunk(dropoffsound);
+         Mix_FreeChunk(pickupsound);
+         Mix_FreeChunk(lasersound);
+         Mix_FreeChunk(warningsound);
          Mix_CloseAudio();
          SDL_Quit();
       };
@@ -1559,6 +1577,7 @@ int main(){
     //check for / process pod pickup
     for(int podloop = 0; podloop<podmax; podloop++){ 
       if((pod_in==0)&&(pods[podloop].active==1)&&(check_collision(pods[podloop], player)==1)){
+        pickupchannel = play_sound_effect(pickupsound);
        pod_in = pods[podloop].number;
        pods[podloop].chase = -1;
        //stop the chase if we steal the pod
@@ -1579,6 +1598,7 @@ int main(){
     //if pod in hand, check for gate dropoff
     if(pod_in>0){
       if((abs(player.y-gate.y)<player.speed)&&(player.x>10)){
+        dropoffchannel = play_sound_effect(dropoffsound);
        //set pod inactive
        for(int podloop = 0; podloop<podmax; podloop++){ if(pod_in==pods[podloop].number){ pods[podloop] = object_out(pods[podloop]); }; };
        
@@ -1596,6 +1616,7 @@ int main(){
       //if laser, do that
       if(laser>0){
        drawlaser=1;
+       laserchannel = play_sound_effect(lasersound);       
        //kill landers
        for(int landerloop = 0; landerloop<landermax; landerloop++){
          if((abs(player.y-landers[landerloop].y)<=40)&&(player.x==landers[landerloop].x)&&((player.face==0&&(landers[landerloop].y<player.y))||(player.face==1&&(landers[landerloop].y>player.y)))){
Fork of https://codeberg.org/gwync/curblaster.git with improvements