Merge branch 'fix_warnings' of lcmstaff/invaders into master

functions.cpp

@@ -644,9 +644,9 @@ void Defeat(int score){
 }
 
 
-void get_SpecialMode(int c,int& chflag,boss& boss1,e_list& enemies,b_list& bullets,b_list& bombs,b_list& powerups,r_list& rockets){
+void get_SpecialMode(int c,int& chflag,boss& boss1,e_list& enemies,b_list& bullets,b_list& bombs,r_list& rockets){
 	if(get_KonamiCode(c)){
-		activate_combo(boss1,enemies,bullets,bombs,powerups,rockets);
+		activate_combo(boss1,enemies,bullets,bombs,rockets);
 		if(chflag==0)
 			chflag=2;
 		if(chflag==1)
@@ -738,7 +738,7 @@ void get_cheat(char command,player& player1,e_list& enemies,double& shootrate){
 	}
 }
 
-void activate_combo(boss& boss1,e_list& enemies,b_list& bullets,b_list& bombs,b_list& powerups,r_list& rockets){		//if the player performs the Konami Code, the normal boss is replaced with BIG_ALIENBOSS
+void activate_combo(boss& boss1,e_list& enemies,b_list& bullets,b_list& bombs,r_list& rockets){		//if the player performs the Konami Code, the normal boss is replaced with BIG_ALIENBOSS
 	boss bossextra(1,1,500,17,5,BOSS_FILE5);
 	boss1 = bossextra;
 	std::string bossname=getenv("HOME");
@@ -888,7 +888,7 @@ void draw(player& player1,b_list& bullets,b_list& bombs,e_list& enemies,w_vec& w
 		mvaddch(wall_p.y,wall_p.x,' ');
 	walls_p.clear();
 	
-	for(int i=0;i<walls.size();i++)
+	for(std::size_t i=0;i<walls.size();i++)
 		for(int k=0;k<walls[i].width;k++)
 			for(int j=0;j<walls[i].height;j++){
 				if(walls[i].health[j][k]==1) attron(COLOR_PAIR(2));

functions.hpp

@@ -102,13 +102,13 @@ void refreshrecords_bossrush(int,WINDOW*);
 
 void print_scores_bossrush();
 
-void get_SpecialMode(int,int&,boss&,e_list&,b_list&,b_list&,b_list&,r_list&);
+void get_SpecialMode(int,int&,boss&,e_list&,b_list&,b_list&,r_list&);
 
 bool get_KonamiCode(int);
 
 void get_cheat(char,player&,e_list&,double&);
 
-void activate_combo(boss&,e_list&,b_list&,b_list&,b_list&,r_list&);
+void activate_combo(boss&,e_list&,b_list&,b_list&,r_list&);
 
 void drop_powerup(int x,int y,b_list& powerups);
 

invaders.cpp

@@ -153,7 +153,7 @@ int main(int argc,char** argv)
 	    	if(chflag==1 || chflag==3)
 			get_cheat(command,player1,enemies,shootrate);
 	    	if(chflag!=2 && chflag!=3)
-			get_SpecialMode(command,chflag,boss1,enemies,bullets,bombs,powerups,rockets);
+			get_SpecialMode(command,chflag,boss1,enemies,bullets,bombs,rockets);
 			
 		//======END CHEATS===============================================