Fix warnings

collision.c

@@ -8,6 +8,8 @@
 #include "resources.h"
 //#include "audio.h"
 
+void tileReaction(_bullet* bull, s16* after_hit, u8* kill_bull, s16* x0, s16* y0, u8 xShift, u8 yShift);
+
 u8 moveAvailableInUnits(_tank *tank) {
 
 
@@ -268,18 +270,18 @@ void detectBulletToUnitsCollision(_bullet *bull) {
     s16 delta_y;
     _tank *player1 = &game_player[0];
     _tank *player2 = &game_player[1];
-    s16 gamer_bull_flag = 0;
+    //s16 gamer_bull_flag = 0;
 
     if ((config.en_friend_fire == KILL) || (config.en_friend_fire == BULLETS_STOP)){
             i = 0;
             end = config.units_on_map;
-            gamer_bull_flag = 1;
+            //gamer_bull_flag = 1;
     }
     else {
         if (bull->maker == player1 || bull->maker == player2) {
             i = 0;
             end = config.units_on_map;
-            gamer_bull_flag = 1;
+            //gamer_bull_flag = 1;
         }
     }
     for (; i < end; i++) {

defs.h

@@ -76,7 +76,7 @@
 
 
 typedef struct {
-    u8* maps_data;
+    const u8* maps_data;
     u8 game_mode;
     u8 difficulty;
     u8 pl_friend_fire;

game.c

@@ -14,6 +14,8 @@
 #include "defs.h"
 //#include "audio.h"
 #include "resources.h"
+#include "option.h"
+#include "mutator.h"
 
 
 
@@ -36,7 +38,7 @@ void joyEventGame(u16 joy, u16 changed, u16 state);
 void vblankCB();
 volatile u16 vb_counter = 0;
 void updateAudio();
-void sleepFrames(int i);
+void soundPlayEngine();
 
 void sleepFrames(int i){
 	int a;
@@ -56,7 +58,10 @@ u8 kills_2[4];
 u32 top_scor;
 u16 level_timer;
 
-
+// main.c
+extern void battlecity_init();
+extern void tank1990_init();
+extern void mods_mode_init();
 
 void setGameMode() {
     switch (config.game_mode) {
@@ -121,7 +126,6 @@ void startGame() {
 
 void selectLevel() {
 
-    u16 i;
     u16 joy = 0;
     s16 stage_ctr = 0;
     u8 init_logic = 0;

game.h

@@ -10,7 +10,7 @@
 
 
 
-
+void sleepFrames(int i);
 void startGame();
 
 extern s16 selected_stage;

gamelogic.c

@@ -606,9 +606,9 @@ void GLog_initGamer(u8 player_idx) {
     }
     victory_timer = 0;
 
-    if (config.debug & BONUS_GOD == BONUS_GOD) {
+    if ((config.debug & BONUS_GOD) == BONUS_GOD) {
 //        game_player[player_idx].bonus = BONUS_GOD;
-        game_player[0].god = 1024*100;
+//        game_player[0].god = 1024*100;
     }
 }
 
@@ -966,19 +966,19 @@ void setBonus(u8 player) {
 
     u16 i;
     switch (bonus.type) {
-        case BONUS_GOD://áåññìåðòèå type = 1;
+        case BONUS_GOD://бессмертие type = 1;
             game_player[player].god = 1024;
             break;
-        case BONUS_TIME://âðåìÿ type = 2;
+        case BONUS_TIME://время type = 2;
 			if (player == 0 || player == 1) freeze = 1024;
 			else freeze_players = 1024;
             break;
-        case BONUS_ARM_STAFF://ëîïàòà type = 3;
+        case BONUS_ARM_STAFF://лопата type = 3;
             if (player == 0 || player == 1) armor_staff = ARMOR_STAFF_TIME;
 			else armor_staff = ARMOR_STAFF_TIME+1;
             break;
 
-        case BONUS_STAR://çâåçäà type = 4;
+        case BONUS_STAR://звезда type = 4;
 
 		if ((player < 2 && !mods.pl_en_tank) || (player >= 2 && mods.en_pl_skin)) {
             game_player[player].type++;
@@ -1017,15 +1017,15 @@ void setBonus(u8 player) {
 				}
 				else if(game_player[player].type == 7){
                     game_player[player].hitpoint += 2;
-                    if(game_player[player].speed == TANK_SPEED_1)game_player[player].speed == TANK_SPEED_2;
-                    else if(game_player[player].speed == TANK_SPEED_2)game_player[player].speed == TANK_SPEED_3;
+                    if(game_player[player].speed == TANK_SPEED_1)game_player[player].speed = TANK_SPEED_2;
+                    else if(game_player[player].speed == TANK_SPEED_2)game_player[player].speed = TANK_SPEED_3;
                     if(game_player[player].bullet_limit == 1)game_player[player].bullet_limit = 2;
                     if(game_player[player].bullet_speed == BULLET_SPEED_1)game_player[player].bullet_speed = BULLET_SPEED_2;
 				}
 		}
             break;
 
-        case BONUS_BOMB://áîìáà type = 5;
+        case BONUS_BOMB://бомба type = 5;
             if(player==0||player==1)
 			for (i = 2; i < config.units_on_map; i++) {
                 if (game_player[i].hitpoint) {
@@ -1049,7 +1049,7 @@ void setBonus(u8 player) {
 			}
             break;
 
-        case BONUS_LIFE://æèçíü type = 6;
+        case BONUS_LIFE://жизнь type = 6;
             if (player==0||player==1) {
                 game_player[player].lives++;
                 soundPlay(snd_live_got, sizeof (snd_live_got), SOUND_PCM_CH1, 0);
@@ -1061,7 +1061,7 @@ void setBonus(u8 player) {
 			}
             break;
 
-		case BONUS_GUN://ïèñòîëåò type = 7;
+		case BONUS_GUN://пистолет type = 7;
 			if(player==0||player==1){
 				game_player[player].type = 3;
 				game_player[player].bullet_speed = BULLET_SPEED_2;
@@ -1083,7 +1083,7 @@ void setBonus(u8 player) {
 			}
             break;
 
-		case BONUS_SHIP://êîðàáëü type = 8;
+		case BONUS_SHIP://корабль type = 8;
 			game_player[player].ship = 1;
 
 			break;

gamelogic.h

@@ -103,7 +103,9 @@ void GLog_setVictory();
 void GLog_removeEnemy();
 
 extern u16 pause;
+void setBonus(u8 player);
 void showScoreQuad(u16 val, u16 posx, u16 posy);
+void soundPlay(const u8 *sample, const u32 len, const u16 channel, const u8 loop);
 
 
 extern _scor scor;

gameover.c

@@ -78,7 +78,6 @@ void showScore() {
     score2[3] = 0;
     score2[4] = 0;
 
-    u16 i;
     u16 joy;
     u8 play_sound;