From: Gwyn Ciesla <limburgher@gmail.com>
Date: Tue, 31 Jan 2017 23:49:15 +0000 (-0600)
Subject: 1.12
X-Git-Tag: 1.12
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=cb34e755a2311ca316a570d2fbb29cca7eeade8b;p=curblaster.git

1.12
cppcheck
---

diff --git a/Makefile b/Makefile
index 84def90..f3965a2 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,10 @@ remove:
 	rm $(INST)/curblaster
 uninstall: remove
 
+check:
+	cppcheck --enable=warning,style,unusedFunction .
+test: check
+
 clean:
 	rm *.o
 	rm curblaster
diff --git a/enemy_shoot.cpp b/enemy_shoot.cpp
index 1db529c..300c72e 100644
--- 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 e2edc6d..bf2e18e 100644
--- 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.11;
+const float version = 1.12;
 
 int score;
 int lives;
@@ -110,6 +110,8 @@ int main(int argc, char *argv[]){
   strcpy (gate.line0, " ^ ");
   strcpy (gate.line1, "/|\\");
   strcpy (gate.radar, "|");
+  gate.chase = -1;
+  gate.phase = 0;
  
   game_object gatebeam1;
   gatebeam1.number = 11;
@@ -433,6 +435,7 @@ int main(int argc, char *argv[]){
   boomstuff.vspeed = 0;
   boomstuff.vtime = 0;
   boomstuff.phase = 0; 
+  boomstuff.chase = -1;
   strcpy (boomstuff.line0, "\\");
   strcpy (boomstuff.line1, "/");
 
diff --git a/mishaps.cpp b/mishaps.cpp
index efbb5db..3b2fd45 100644
--- 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;  
diff --git a/powerup.cpp b/powerup.cpp
index 77b4b4f..aa5ef70 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[], 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 7f569df..653d59d 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[], game_object&, int, Mix_Chunk*, int);