From e1ac070634c593a270d0751784f0e2be76b73085 Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Tue, 10 Mar 2020 10:05:18 +0100
Subject: [PATCH] (collide.c/h ; main.c) Fixed visual glitch and implemented
 secret ways. Created new functions in collide.c to make this kind of
 destructive collisions easier. Improved by a bit the level design and fixed
 the related softlock.

---
 include/collide.h |   2 ++
 platform.g3a      | Bin 68460 -> 68684 bytes
 src/collide.c     |  41 +++++++++++++++++++++++++++++++++++------
 src/main.c        |   6 ++++--
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/include/collide.h b/include/collide.h
index f243bab..9be6f95 100644
--- a/include/collide.h
+++ b/include/collide.h
@@ -1,2 +1,4 @@
 char collide(int x, int y, char level[], char tile);
 char collide_solid(int x, int y, char level[]);
+char collide_point(int x, int y, char level[], char tile);
+char collide_and_erase(int x, int y, char level[], char tile);
diff --git a/platform.g3a b/platform.g3a
index 4868492b9d3e344698a88749d7ec232e8d4a7106..7756201a2e9cdb60bf5c50156b831034b701885d 100644
GIT binary patch
delta 3392
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
P(fx<pG~5@w>*oIexr9%d

delta 3126
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%0DkEKegYClw%8;xD~D!sAu9<*IX)y}K;!_G
z_Tb=aIQK;=7iGj@m-y>G2*w;77ubWfxQR)zNcGYhwMu*(z8K@O(RYxZIKm~_#3+#i
z_@EuOFj|KsxXN2sDrAHZ+S96`k8eiPkG|2-W8Z}ThMv>fzv<+0adBJer?-~Twp%I<
z8pXw}!GC1Kk88rW8%(y<13=be-}W{Gc@Hz$h#BU}@eV8kk{1ZXegnv!G9VkGfRvbl
zta=3GU>lJASaIp<<}sKjq2(eCrwn9@FOaEsMy4-0lact5u1VsljFI100-5F*Rh-f#
aj+uPq!SRs<HJ8K(wjU{0bKmpYw*LWcHuxF<

diff --git a/src/collide.c b/src/collide.c
index 8c580ee..3570031 100644
--- a/src/collide.c
+++ b/src/collide.c
@@ -1,4 +1,5 @@
 #include "collide.h"
+#include "draw.h"
 
 #define PLAYER_SIDES 11
 #define LEVEL_WIDTH 28
@@ -7,15 +8,17 @@ char collide(int x, int y, char level[], char tile)
 {
 	if ((level[(int)(x/16) + (int)(y/16) * LEVEL_WIDTH] == tile) ||
 	(level[(int)(x/16) + (int)((y+PLAYER_SIDES)/16) * LEVEL_WIDTH] == tile) ||
-	(level[(int)((x+PLAYER_SIDES)/16) + (int)((y+PLAYER_SIDES)/16) * LEVEL_WIDTH] == tile) ||
-	(level[(int)((x+PLAYER_SIDES)/16) + (int)(y/16) * LEVEL_WIDTH] == tile) /*||
-	(level[(int)(x/16) + (int)((y+PLAYER_SIDES/2)/16) * LEVEL_WIDTH] == tile) ||
-	(level[(int)((x+PLAYER_SIDES/2)/16) + (int)(y/16) * LEVEL_WIDTH] == tile) ||
-	(level[(int)((x+PLAYER_SIDES/2)/16) + (int)((y+PLAYER_SIDES)/16) * LEVEL_WIDTH] == tile) ||
-	(level[(int)((x+PLAYER_SIDES)/16) + (int)((y+PLAYER_SIDES/2)/16) * LEVEL_WIDTH] == tile)*/) return 1;
+	(level[(int)((x+PLAYER_SIDES)/16) + (int)((y+PLAYER_SIDES)/16) *
+	LEVEL_WIDTH] == tile) || (level[(int)((x+PLAYER_SIDES)/16) + (int)(y/16) *
+	LEVEL_WIDTH] == tile)) return 1;
 	return 0;
 }
 
+char collide_point(int x, int y, char level[], char tile)
+{
+	return (level[(int)(x/16) + (int)(y/16) * LEVEL_WIDTH] == tile);
+}
+
 char collide_solid(int x, int y, char level[])
 {
 	return (collide(x, y, level, '0') ||
@@ -23,3 +26,29 @@ char collide_solid(int x, int y, char level[])
 		collide(x, y, level, '~') ||
 		collide(x, y, level, '#'));
 }
+
+char collide_and_erase(int x, int y, char level[], char tile)
+{
+	char collided = 0;
+	if (collide_point(x, y, level, tile))
+	{
+		erase_tile(x, y, level);
+		collided = 1;
+	}
+	if (collide_point(x + 11, y, level, tile))
+	{
+		erase_tile(x + 11, y, level);
+		collided = 1;
+	}
+	if (collide_point(x, y + 11, level, tile))
+	{
+		erase_tile(x, y + 11, level);
+		collided = 1;
+	}
+	if (collide_point(x + 11, y + 11, level, tile))
+	{
+		erase_tile(x + 11, y + 11, level);
+		collided = 1;
+	}
+	return collided;
+}
diff --git a/src/main.c b/src/main.c
index 36b0431..ae46d0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -230,7 +230,7 @@ int main(void)
 		if (collide(player_x, player_y, level, 'j'))
 		{
 			UG_CAN_JUMP = 1;
-			erase_tile(player_x, player_y, level);
+			collide_and_erase(player_x, player_y, level, 'j');
 			draw_upgrade_message('j');
 		}
 		//coin get
@@ -238,8 +238,10 @@ int main(void)
 		{
 			coins[coin_id] = 1;
 			coin_count++;
-			erase_tile(player_x, player_y, level);
+			collide_and_erase(player_x, player_y, level, 'c');
 		}
+		//secret way/hidden passage
+		collide_and_erase(player_x, player_y, level, 's');
 		//exit
 		if (keydown(KEY_EXIT)) return 0;
 	}