From 3d297a0cfe842f7a5b288e709ea744a30f36447c Mon Sep 17 00:00:00 2001
From: Gregory Montoir <cyx@users.sourceforge.net>
Date: Sun, 19 Dec 2021 08:26:40 +0800
Subject: [PATCH] Import blues from 7df5d1cc

---
 main.c        |   2 +-
 p2/game.h     |   2 +
 p2/level.c    | 106 +++++++++++++++++++++++++++++++++++++++++++++++++-
 p2/monsters.c |  19 ++++-----
 p2/resource.c |   2 +
 p2/resource.h |   2 +
 sys_sdl2.c    |   3 +-
 7 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/main.c b/main.c
index f50ab77..d52937a 100644
--- a/main.c
+++ b/main.c
@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
 	g_options.start_ypos16 = -1;
 	g_options.screen_w = 320;
 	g_options.screen_h = 200;
-	g_options.amiga_copper_bars =  true;
+	g_options.amiga_copper_bars = true;
 	g_options.amiga_colors = true;
 	// g_options.amiga_status_bar = true;
 	g_options.dos_scrolling = false;
diff --git a/p2/game.h b/p2/game.h
index 6495497..70aac00 100644
--- a/p2/game.h
+++ b/p2/game.h
@@ -122,6 +122,8 @@ struct vars_t {
 		bool keystate[128];
 		uint8_t key_left, key_right, key_down, key_up, key_space;
 		uint8_t key_vdir, key_hdir;
+		uint16_t demo_offset;
+		uint8_t demo_mask, demo_counter;
 	} input;
 
 	uint8_t level_num;
diff --git a/p2/level.c b/p2/level.c
index 4424759..48ed01b 100644
--- a/p2/level.c
+++ b/p2/level.c
@@ -8,6 +8,10 @@
 
 static const bool _score_8_digits = true; /* maximum score 99.999.999 */
 
+static const bool _demo_inputs = false;
+
+static const bool _expert = true;
+
 static const bool _redraw_tilemap = true;
 static const bool _redraw_panel = true;
 
@@ -191,7 +195,7 @@ static void load_level_data_init_password_items() {
 	}
 	qsort(items_ptr_tbl, count, sizeof(struct level_item_t *), compare_level_item_x_pos);
 	/* level password */
-	const uint16_t r = random_get_number3(g_vars.level_num);
+	const uint16_t r = random_get_number3(g_vars.level_num + (_expert ? 10 : 0));
 	for (int j = 0; j < count; j += 4) {
 		for (int i = 0; i < 4; ++i) {
 			struct level_item_t *item = items_ptr_tbl[j + i];
@@ -1559,7 +1563,7 @@ static void level_update_objects_monsters() {
 	}
 	for (int i = 0; i < g_res.level.monsters_count; ++i) {
 		struct level_monster_t *m = &g_res.level.monsters_tbl[i];
-		if (m->spr_num != 0xFFFF && (m->flags & 4) == 0) {
+		if (m->spr_num != 0xFFFF && (m->flags & 4) == 0 && (_expert || (m->type & 0x80) == 0)) {
 			const int type = m->type & 0x7F;
 			if (!monster_func2(type, m)) {
 				continue;
@@ -2381,6 +2385,30 @@ static void level_update_player() {
 		return;
 	}
 	input_check_ctrl_alt_w();
+	if (_demo_inputs) {
+		if (g_vars.input.demo_offset < g_res.keyblen) {
+			if (g_vars.input.demo_offset == 0) {
+				if (g_res.keyb[1] == 0xFF) {
+					g_vars.input.demo_offset += 2;
+				}
+			}
+			if (g_vars.input.demo_counter == 0) {
+				const uint16_t num = READ_LE_UINT16(g_res.keyb + g_vars.input.demo_offset);
+				g_vars.input.demo_offset += 2;
+				g_vars.input.demo_mask = num & 255;
+				g_vars.input.demo_counter = num >> 8;
+			} else {
+				--g_vars.input.demo_counter;
+			}
+			g_vars.input.key_left = (g_vars.input.demo_mask & 1) != 0;
+			g_vars.input.key_right = (g_vars.input.demo_mask & 2) != 0;
+			g_vars.input.key_up = (g_vars.input.demo_mask & 4) != 0;
+			g_vars.input.key_down = (g_vars.input.demo_mask & 8) != 0;
+			g_vars.input.key_space = (g_vars.input.demo_mask & 0x10) != 0;
+		} else {
+			g_vars.player_death_flag = 1;
+		}
+	}
 	g_vars.input.key_vdir = g_vars.input.key_up | g_vars.input.key_down;
 	g_vars.input.key_hdir = g_vars.input.key_left | g_vars.input.key_right;
 	if (g_vars.input.key_right != 0) {
@@ -3663,6 +3691,80 @@ static void level_completed_bonuses_animation() {
 	} while (g_vars.objects_tbl[2].x_pos > -52);
 }
 
+static void update_object_demo_animation(struct object_t *obj) {
+	const uint8_t *p = obj->data.m.anim;
+	int16_t num = READ_LE_UINT16(p);
+	if (num < 0) {
+		p += num;
+		num = READ_LE_UINT16(p);
+	}
+	int spr_num = (num & 0x1FFF) + g_res.spr_monsters_offset;
+	if (obj->data.m.x_velocity < 0) {
+		num |= 0x8000;
+	}
+	obj->spr_num = spr_num;
+	obj->data.m.anim = p + 2;
+}
+
+void do_demo_animation() {
+	g_vars.objects_tbl[1].x_pos = 0;
+	g_vars.objects_tbl[1].y_pos = 169;
+	g_vars.objects_tbl[1].data.p.hdir = 0;
+	g_vars.objects_tbl[1].x_velocity = 0;
+	static const uint8_t data[] = {
+		0, 0, 0, 0, 1, 0, 1, 0, 2, 0, 2, 0, 3, 0, 3, 0,
+		4, 0, 4, 0, 5, 0, 5, 0, 0xE8, 0xFF
+	};
+	g_vars.objects_tbl[1].data.p.anim = data;
+	g_vars.objects_tbl[2].x_pos = 48;
+	g_vars.objects_tbl[2].y_pos = 169;
+	g_vars.objects_tbl[2].x_velocity = 0;
+	g_vars.objects_tbl[2].data.m.anim = &monster_anim_tbl[0x2EA];
+	g_vars.player_flying_flag = 0;
+	int counter = 0;
+	do {
+		++counter;
+		level_update_object_anim(g_vars.objects_tbl[1].data.p.anim);
+		update_object_demo_animation(&g_vars.objects_tbl[2]);
+		level_draw_objects();
+		level_sync();
+		int dx = 5;
+		g_vars.objects_tbl[1].x_pos += dx;
+		if ((counter & 3) == 0) {
+			--dx;
+		}
+		g_vars.objects_tbl[2].x_pos += dx;
+	} while ((g_vars.objects_tbl[1].spr_num & 0x2000) != 0);
+	g_vars.objects_tbl[1].data.p.hdir = -1;
+	g_vars.objects_tbl[2].data.m.x_velocity = -1;
+	g_vars.objects_tbl[2].data.m.y_velocity = 0;
+	for (int i = 1; i < 3; ++i) {
+		struct object_t *obj = &g_vars.objects_tbl[2 + i];
+		*obj = g_vars.objects_tbl[2];
+	}
+	for (int i = 0; i < 3; ++i) {
+		struct object_t *obj = &g_vars.objects_tbl[2 + i];
+		obj->x_pos = g_vars.objects_tbl[1].x_pos + i * 30;
+		obj->y_pos = g_vars.objects_tbl[1].y_pos - i * 3;
+	}
+	do {
+		level_update_object_anim(g_vars.objects_tbl[1].data.p.anim);
+		for (int i = 0; i < 3; ++i) {
+			struct object_t *obj = &g_vars.objects_tbl[2 + i];
+			obj->x_pos -= 5;
+			update_object_demo_animation(obj);
+			if (obj->y_pos > 169) {
+				obj->data.m.y_velocity = -obj->data.m.y_velocity;
+			}
+			obj->data.m.y_velocity += 8;
+			obj->y_pos += (obj->data.m.y_velocity >> 4);
+		}
+		level_draw_objects();
+		level_sync();
+		g_vars.objects_tbl[1].x_pos -= 7;
+	} while (g_vars.objects_tbl[1].x_pos >= 0);
+}
+
 void do_level() {
 	static const uint8_t music_tbl[] = { 9, 9, 0, 0, 0, 13, 4, 4, 10, 13, 16, 16, 16, 9, 14, 4 };
 	play_music(music_tbl[g_vars.level_num]);
diff --git a/p2/monsters.c b/p2/monsters.c
index c2443a0..99a3538 100644
--- a/p2/monsters.c
+++ b/p2/monsters.c
@@ -737,7 +737,7 @@ static bool monster_func2_type9(struct level_monster_t *m) {
 }
 
 static bool monster_func2_type10(struct level_monster_t *m) {
-	if (g_vars.level_num == 5 && g_vars.shake_screen_counter != 0) {
+	if (g_vars.level_num == 5 && (g_vars.shake_screen_counter != 0 || g_vars.boss_level5.state == 3)) {
 		return false;
 	}
 	if (m->current_tick < UCHAR_MAX) {
@@ -777,15 +777,16 @@ static bool monster_func2_type10(struct level_monster_t *m) {
 	uint16_t pos = (bh << 8) | bl;
 	for (int i = 0; i < 10 && pos >= 0x300; ++i, pos -= 0x100) {
 		if (pos < (g_vars.tilemap.h << 8)) {
-			bool init_spr = true;
-			for (int j = 0; j < 3; ++j) {
-				const uint8_t tile_num = g_res.leveldat[pos - j * 0x100];
-				if (g_res.level.tile_attributes1[tile_num] != 0) {
-					init_spr = false;
-					break;
-				}
+			const uint8_t tile_num0 = g_res.leveldat[pos];
+			if (g_res.level.tile_attributes1[tile_num0] == 0) {
+				continue;
 			}
-			if (init_spr) {
+			const uint8_t tile_num1 = g_res.leveldat[pos - 0x100];
+			if (g_res.level.tile_attributes1[tile_num1] != 0) {
+				continue;
+			}
+			const uint8_t tile_num2 = g_res.leveldat[pos - 0x200];
+			if (g_res.level.tile_attributes1[tile_num2] == 0) {
 				obj->y_pos = (pos >> 8) << 4;
 				obj->spr_num = m->spr_num;
 				obj->data.m.ref = m;
diff --git a/p2/resource.c b/p2/resource.c
index 3bf0ce0..4d4140b 100644
--- a/p2/resource.c
+++ b/p2/resource.c
@@ -45,6 +45,8 @@ void res_init(const char *path, int vga_size) {
 	g_res.frontlen = g_uncompressed_size;
 	g_res.uniondat = load_file("UNION.SQZ");
 	g_res.unionlen = g_uncompressed_size;
+	g_res.keyb     = load_file("KEYB.SQZ");
+	g_res.keyblen  = g_uncompressed_size;
 
 	g_res.vga = (uint8_t *)malloc(vga_size);
 	if (!g_res.vga) {
diff --git a/p2/resource.h b/p2/resource.h
index 0b91e4d..1005dea 100644
--- a/p2/resource.h
+++ b/p2/resource.h
@@ -168,6 +168,8 @@ struct resource_t {
 	int frontlen;
 	uint8_t *uniondat;
 	int unionlen;
+	uint8_t *keyb;
+	int keyblen;
 	uint8_t *leveldat;
 	int levellen;
 	uint8_t *vga;
diff --git a/sys_sdl2.c b/sys_sdl2.c
index 6d97980..96df4c6 100644
--- a/sys_sdl2.c
+++ b/sys_sdl2.c
@@ -656,8 +656,7 @@ static void render_load_sprites(int spr_type, int count, const struct sys_rect_t
 	if (update_pal) { /* update texture on palette change */
 		sheet->surface = surface;
 	} else  {
-		SDL_FreeSurface(sheet->surface);
-		sheet->surface = 0;
+		SDL_FreeSurface(surface);
 	}
 }