File fix-version-and-compile-warnings.patch of Package meritous

Overview Repositories Revisions Requests Users Attributes Meta

File fix-version-and-compile-warnings.patch of Package meritous

diff --git a/src/boss.c b/src/boss.c
index a1423cd..8cc9277 100755
--- a/src/boss.c
+++ b/src/boss.c
@@ -691,9 +691,9 @@ void DrawBoss()
 			} else {
 				if (dist(tail_x[0], tail_y[0], boss_x, boss_y) >= 24) {
 					if (boss_tail_len < 10) boss_tail_len++;
-					for (i = 9; i >= 0; i--) {
-						tail_x[i+1] = tail_x[i];
-						tail_y[i+1] = tail_y[i];
+					for (i = 9; i >= 1; i--) {
+						tail_x[i] = tail_x[i-1];
+						tail_y[i] = tail_y[i-1];
 					}
 					tail_x[0] = boss_x;
 					tail_y[0] = boss_y;
@@ -1020,7 +1020,7 @@ void BC_BossCombat()
 				}
 				case 1: {
 					int laser_dmg;
-					float laser_1_dir, laser_2_dir, laser_3_dir;
+					float laser_1_dir, laser_2_dir;
 					
 					laser_dmg = (rand()%(player_shield/2+1))/2;
 					for (i = 0; i < player_shield / 4 + 1; i++) {
@@ -1030,7 +1030,6 @@ void BC_BossCombat()
 					}
 					laser_1_dir = pdir + 0.4 + sin((float)t / 8)*0.3;
 					laser_2_dir = pdir - 0.4 + sin((float)t / 8)*0.3;
-					laser_3_dir = RandomDir();
 					SpawnLaser(boss_x + pdir_x * 24, boss_y + pdir_y * 8, laser_1_dir, 0, 1, 0, laser_dmg);
 					SpawnLaser(boss_x + pdir_x * 24, boss_y + pdir_y * 8, laser_2_dir, 0, 1, 0, laser_dmg);
 					if ((t % 5) == 0)
diff --git a/src/levelblit.c b/src/levelblit.c
index edd3a35..5ab33fd 100755
--- a/src/levelblit.c
+++ b/src/levelblit.c
@@ -41,7 +41,7 @@
 #define PLAYERW 16
 #define PLAYERH 24
 
-#define MERITOUS_VERSION "v 1.1"
+#define MERITOUS_VERSION "v 1.2"
 int RECORDING = 0;
 int PLAYBACK = 0;
 
@@ -385,7 +385,6 @@ int main(int argc, char **argv)
 	Uint8 *src_p, *col_p;
 	Uint8 wm_mask[128];
 	int i;
-	int light = 0;
 	int x, y;
 	int pulse[SCREEN_W * SCREEN_H];
 	int precalc_sine[400];
@@ -577,7 +576,6 @@ int main(int argc, char **argv)
 			
 			EndCycle(10);
 	
-			light = 0;
 			tick -= 2;
 		}
 		
@@ -2548,7 +2546,6 @@ void SpecialTile(int x, int y)
 
 void ScrollTo(int x, int y)
 {
-	static int scrollspeed_x = 1, scrollspeed_y = 1;
 	if (scroll_home == 0) {
 		scroll_x = x;
 		scroll_y = y;
@@ -2556,8 +2553,6 @@ void ScrollTo(int x, int y)
 	}
 
 	if (scroll_home == 1) {
-		scrollspeed_x = (x - scroll_x)/20;
-		scrollspeed_y = (y - scroll_y)/20;
 		scroll_home = 2;
 	}
 
@@ -2599,7 +2594,9 @@ void DrawArtifacts()
 
 void Swap(int *a, int *b)
 {
-	*a ^= *b ^= *a ^= *b;
+	*a ^= *b;
+	*b ^= *a;
+	*a ^= *b;
 }
 
 void ThinLine(SDL_Surface *scr, int x1, int y1, int x2, int y2, Uint8 col)

Places

File fix-version-and-compile-warnings.patch of Package meritous

Places