From 30f972c4e33367dd47e8e128583c32ba41329a3f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 27 Aug 2020 09:34:39 -0500 Subject: [PATCH] Use constant game object in powerup determination. --- main.cpp | 12 ++++++++---- powerup.cpp | 2 +- powerup.h | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/main.cpp b/main.cpp index b87a68f..7cb914b 100644 --- a/main.cpp +++ b/main.cpp @@ -1100,7 +1100,8 @@ int main(int argc, char *argv[]){ //kill landers for(int landerloop = 0; landerloop=540))&&(player.x==landers[landerloop].x)&&((player.face==0&&(landers[landerloop].yplayer.y)))){ - determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel); + const game_object power_obj = landers[landerloop]; + determine_powerup(powerups, power_obj, 800, pupcreatesound, pupcreatechannel); drawlocation = boom_object(drawlocation, boomstuff, landers[landerloop], boomsound, boomchannel); landers[landerloop] = object_out(landers[landerloop]); score = score + 15; @@ -1109,7 +1110,8 @@ int main(int argc, char *argv[]){ //kill crazies for(int crazyloop = 0; crazyloop=540))&&(player.x==crazies[crazyloop].x)&&((player.face==0&&(crazies[crazyloop].yplayer.y)))){ - determine_powerup(powerups, crazies[crazyloop], 800, pupcreatesound, pupcreatechannel); + const game_object power_obj = crazies[crazyloop]; + determine_powerup(powerups, power_obj, 800, pupcreatesound, pupcreatechannel); drawlocation = boom_object(drawlocation, boomstuff, crazies[crazyloop], boomsound, boomchannel); crazies[crazyloop] = object_out(crazies[crazyloop]); score = score + 15; @@ -1118,7 +1120,8 @@ int main(int argc, char *argv[]){ //kill crawlers for(int crawlerloop = 0; crawlerloop=540))&&(player.x==crawlers[crawlerloop].x)&&((player.face==0&&(crawlers[crawlerloop].yplayer.y)))){ - determine_powerup(powerups, crawlers[crawlerloop], 800, pupcreatesound, pupcreatechannel); + const game_object power_obj = crawlers[crawlerloop]; + determine_powerup(powerups, power_obj, 800, pupcreatesound, pupcreatechannel); drawlocation = boom_object(drawlocation, boomstuff, crawlers[crawlerloop], boomsound, boomchannel); crawlers[crawlerloop] = object_out(crawlers[crawlerloop]); score = score + 15; @@ -1130,7 +1133,8 @@ int main(int argc, char *argv[]){ if(((abs(player.y-bosses[bossloop].y)<=80)||(abs(player.y-bosses[bossloop].y)>=540))&&(player.x==bosses[bossloop].x)&&((player.face==0&&(bosses[bossloop].yplayer.y)))){ bosses[bossloop].phase = bosses[bossloop].phase - 5; if(bosses[bossloop].phase<=0){ - determine_powerup(powerups, bosses[bossloop], 600, pupcreatesound, pupcreatechannel); + const game_object power_obj = bosses[bossloop]; + determine_powerup(powerups, power_obj, 600, pupcreatesound, pupcreatechannel); drawlocation = boom_object(drawlocation, boomstuff, bosses[bossloop], boomsound, boomchannel); bosses[bossloop] = object_out(bosses[bossloop]); score = score + 75; diff --git a/powerup.cpp b/powerup.cpp index 6e2d69c..c6b6331 100644 --- a/powerup.cpp +++ b/powerup.cpp @@ -45,7 +45,7 @@ game_object powerup_init(game_object powerup, game_object object){ return powerup; }; -void determine_powerup(game_object powerups[], game_object& object, int odds, Mix_Chunk *sound, int channel){ +void determine_powerup(game_object powerups[], const game_object& object, int odds, Mix_Chunk *sound, int channel){ if(rand()%1000>odds){ for(int puploop = 0; puploop<4; puploop++){ if(powerups[puploop].active==0){ diff --git a/powerup.h b/powerup.h index 653d59d..7c79584 100644 --- a/powerup.h +++ b/powerup.h @@ -1,2 +1,2 @@ game_object powerup_init(game_object, game_object); -void determine_powerup(game_object[], game_object&, int, Mix_Chunk*, int); +void determine_powerup(game_object[], const game_object&, int, Mix_Chunk*, int); -- 2.9.0