Repositories / curblaster.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 00a6632)
Passed channels through play_sound_effect to silence compiler warnings. 1.05
authorGwyn Ciesla <limb@jcomserv.net>
Fri, 10 Jun 2011 18:23:34 +0000 (13:23 -0500)
committerGwyn Ciesla <limb@jcomserv.net>
Fri, 10 Jun 2011 18:23:34 +0000 (13:23 -0500)
Version 1.05.

enemy_shoot.cpp patch | blob | blame | history
main.cpp patch | blob | blame | history
mishaps.cpp patch | blob | blame | history
play_sound_effect.cpp patch | blob | blame | history
play_sound_effect.h patch | blob | blame | history
powerup.cpp patch | blob | blame | history

diff --git a/enemy_shoot.cpp b/enemy_shoot.cpp
index d958d23..afeb69a 100644 (file)
--- a/enemy_shoot.cpp
+++ b/enemy_shoot.cpp
@@ -7,7 +7,7 @@
 game_object enemy_shoot(game_object enemy, game_object player, game_object shot, int enshotchannel, Mix_Chunk *enshotsound){
 
   int multiplier = 1;
-  enshotchannel = play_sound_effect(enshotsound);
+  enshotchannel = play_sound_effect(enshotsound, enshotchannel);
   shot.active=1;
   //set direction
   if(player.y<enemy.y){ 
diff --git a/main.cpp b/main.cpp
index 47a090c..b7dd5b3 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -48,7 +48,7 @@ const int landershotmax = 10;
 const int landermax = 12;
 const int crawlermax = 6;
 const int missilemax = 3;
-const float version = 1.04;
+const float version = 1.05;
 
 int score;
 int lives;
@@ -909,14 +909,14 @@ int main(int argc, char *argv[]){
     //alerts
     if(alertright>0){
       if(alertright%2==0){
-        warningchannel = play_sound_effect(warningsound);
+        warningchannel = play_sound_effect(warningsound, warningchannel);
        mvprintw(19,50," >> ");
       };
       alertright--;
     };
     if(alertleft>0){
       if(alertleft%2==0){
-        warningchannel = play_sound_effect(warningsound);
+        warningchannel = play_sound_effect(warningsound, warningchannel);
        mvprintw(19,40," << ");
       };
       alertleft--;
@@ -955,11 +955,11 @@ int main(int argc, char *argv[]){
       if(shieldup==0){
        if(shieldsleft>=1){
          shieldup=1;
-         shieldupchannel = play_sound_effect(shieldupsound);
+         shieldupchannel = play_sound_effect(shieldupsound, shieldupchannel);
        };
       } else {
        shieldup=0;
-       shielddownchannel = play_sound_effect(shielddownsound);
+       shielddownchannel = play_sound_effect(shielddownsound, shielddownchannel);
       };
     };
 
@@ -980,7 +980,7 @@ int main(int argc, char *argv[]){
        shieldsleft--;
       } else {
        shieldup=0;
-       shielddownchannel = play_sound_effect(shielddownsound);
+       shielddownchannel = play_sound_effect(shielddownsound, shielddownchannel);
       };
     };
 
@@ -1003,7 +1003,7 @@ int main(int argc, char *argv[]){
     //check for powerup pickup
     for(int puploop = 0; puploop<4; puploop++){
       if((powerups[puploop].active==1)&&(check_collision(powerups[puploop], player)==1)){
-        puptakechannel = play_sound_effect(puptakesound);
+        puptakechannel = play_sound_effect(puptakesound, puptakechannel);
        powerups[puploop] = object_out(powerups[puploop]);
        if(strncmp(powerups[puploop].line0, "T", 1)==0){
          tripshot = tripshot + 100;
@@ -1038,7 +1038,7 @@ int main(int argc, char *argv[]){
     //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);
+        pickupchannel = play_sound_effect(pickupsound, pickupchannel);
        pod_in = pods[podloop].number;
        pods[podloop].chase = -1;
        //stop the chase if we steal the pod
@@ -1061,7 +1061,7 @@ int main(int argc, char *argv[]){
     //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);
+        dropoffchannel = play_sound_effect(dropoffsound, dropoffchannel);
        //set pod inactive
        for(int podloop = 0; podloop<podmax; podloop++){ if(pod_in==pods[podloop].number){ pods[podloop] = object_out(pods[podloop]); }; };
        
@@ -1079,7 +1079,7 @@ int main(int argc, char *argv[]){
       //if laser, do that
       if(laser>0){
        drawlaser=1;
-       laserchannel = play_sound_effect(lasersound);       
+       laserchannel = play_sound_effect(lasersound, laserchannel);
        //kill landers
        for(int landerloop = 0; landerloop<landermax; landerloop++){
          if(((abs(player.y-landers[landerloop].y)<=80)||(abs(player.y-landers[landerloop].y)>=540))&&(player.x==landers[landerloop].x)&&((player.face==0&&(landers[landerloop].y<player.y))||(player.face==1&&(landers[landerloop].y>player.y)))){
@@ -1124,7 +1124,7 @@ int main(int argc, char *argv[]){
        laser--;
       } else {
         //shot sound
-        if(sound==1){shotchannel = play_sound_effect(shotsound);};
+        if(sound==1){shotchannel = play_sound_effect(shotsound, shotchannel);};
        //get next inactive bullet, give it player's direction, speed, height, location +speed in direction, active.
        for(int bulletloop = 0; bulletloop<bulletmax; bulletloop++){ 
          if(bullets[bulletloop].active==0){ 
@@ -1567,7 +1567,7 @@ int main(int argc, char *argv[]){
               if(missiles[missileloop].chase==-1){
                 missiles[missileloop].chase = landerloop;
                 //play missle launch sound
-                missilechannel = play_sound_effect(missilesound);
+                missilechannel = play_sound_effect(missilesound, missilechannel);
                 //init missle
                 missiles[missileloop] = missile_init(missiles[missileloop], player, landers[landerloop]);
                 missile--;
@@ -1605,7 +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);
+         levelendchannel = play_sound_effect(levelendsound, levelendchannel);
          //Tally bonuses
          //Award lives, if any
          if(lives<4){lives++;};
diff --git a/mishaps.cpp b/mishaps.cpp
index c85331d..8e0a818 100644 (file)
--- a/mishaps.cpp
+++ b/mishaps.cpp
@@ -9,7 +9,7 @@
 #include "play_sound_effect.h"
 
 game_object encrazify(game_object lander, game_object crazy, Mix_Chunk *sound, int channel){
-  channel = play_sound_effect(sound);
+  channel = play_sound_effect(sound, channel);
   crazy.active=1;
   crazy.x = lander.x;
   crazy.y = lander.y;  
@@ -27,7 +27,7 @@ int boom_object(int drawlocation, game_object boomstuff, game_object object, Mix
   int deathcycle=1;
   int loop=1;
   boomstuff.active=1;
-  channel = play_sound_effect(sound);
+  channel = play_sound_effect(sound, channel);
   while(deathcycle<=7){
     for(int boomx=object.x-10;boomx<=object.x+10;boomx++){
       for(int boomy=object.y-10;boomy<=object.y+10;boomy++){
diff --git a/play_sound_effect.cpp b/play_sound_effect.cpp
index dfdb52c..00c47ec 100644 (file)
--- a/play_sound_effect.cpp
+++ b/play_sound_effect.cpp
@@ -1,7 +1,7 @@
 #include "SDL/SDL.h"
 #include "SDL/SDL_mixer.h"
 
-int play_sound_effect(Mix_Chunk *chunk){
-  int channel = Mix_PlayChannel(-1, chunk, 0);
+int play_sound_effect(Mix_Chunk *chunk, int channel){
+  channel = Mix_PlayChannel(-1, chunk, 0);
   return channel;
 };
\ No newline at end of file
diff --git a/play_sound_effect.h b/play_sound_effect.h
index b21ebc3..203e9a2 100644 (file)
--- a/play_sound_effect.h
+++ b/play_sound_effect.h
@@ -1 +1 @@
-int play_sound_effect(Mix_Chunk*);
+int play_sound_effect(Mix_Chunk*, int);
diff --git a/powerup.cpp b/powerup.cpp
index ad0c2c1..399428c 100644 (file)
--- a/powerup.cpp
+++ b/powerup.cpp
@@ -49,7 +49,7 @@ void determine_powerup(game_object powerups[], game_object object, int odds, Mix
   if(rand()%1000>odds){
     for(int puploop = 0; puploop<4; puploop++){
       if(powerups[puploop].active==0){
-        channel = play_sound_effect(sound);
+        channel = play_sound_effect(sound, channel);
         powerups[puploop] = powerup_init(powerups[puploop], object);
        break;
       };
Fork of https://codeberg.org/gwync/curblaster.git with improvements