From 6981f70a8fd067c59485c7d85d8eb3ed043d47b3 Mon Sep 17 00:00:00 2001
From: KikooDX <kikoodissident@gmail.com>
Date: Fri, 14 Feb 2020 15:11:36 +0100
Subject: [PATCH] Improved collisions Collide function should be ~2 times
 faster now, vertical collision now reset jump_hold.

---
 platform.g3a  | Bin 56828 -> 56748 bytes
 src/collide.c |   4 ++--
 src/main.c    |   7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform.g3a b/platform.g3a
index c1d5efe4425ef33489fd2014b191ffbc544cbac2..c4084eca6b24220a16a6ed05560fb6c636572f95 100644
GIT binary patch
delta 2112
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
apJ#c@3&oa66#yIWiN{97-T9eoi1{BbF=B%N

delta 2246
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
b_&iKwnJBh|RRHW*zkyV-?*1RS({uj=Oecv8

diff --git a/src/collide.c b/src/collide.c
index 2357da2..1cffad3 100644
--- a/src/collide.c
+++ b/src/collide.c
@@ -6,11 +6,11 @@ char collide(int x, int y, char level[], char tile)
   if ((level[(int)(x/8) + (int)(y/8) * LEVEL_WIDTH] == tile) ||
     (level[(int)(x/8) + (int)((y+PLAYER_SIDES)/8) * LEVEL_WIDTH] == tile) ||
     (level[(int)((x+PLAYER_SIDES)/8) + (int)((y+PLAYER_SIDES)/8) * LEVEL_WIDTH] == tile) ||
-    (level[(int)((x+PLAYER_SIDES)/8) + (int)(y/8) * LEVEL_WIDTH] == tile) ||
+    (level[(int)((x+PLAYER_SIDES)/8) + (int)(y/8) * LEVEL_WIDTH] == tile) /*||
     (level[(int)(x/8) + (int)((y+PLAYER_SIDES/2)/8) * LEVEL_WIDTH] == tile) ||
     (level[(int)((x+PLAYER_SIDES/2)/8) + (int)(y/8) * LEVEL_WIDTH] == tile) ||
     (level[(int)((x+PLAYER_SIDES/2)/8) + (int)((y+PLAYER_SIDES)/8) * LEVEL_WIDTH] == tile) ||
-    (level[(int)((x+PLAYER_SIDES)/8) + (int)((y+PLAYER_SIDES/2)/8) * LEVEL_WIDTH] == tile)) return 1;
+    (level[(int)((x+PLAYER_SIDES)/8) + (int)((y+PLAYER_SIDES/2)/8) * LEVEL_WIDTH] == tile)*/) return 1;
   return 0;
 }
 
diff --git a/src/main.c b/src/main.c
index ff2612d..9978982 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ int main(void)
 		}
 		//vertical movement
 		if (UG_CAN_JUMP) jump_test(&jump_pressed, &jump_buffer, &jump_hold);
-		//if jump is pressed and on ground
+		//jump
 		if (jump_buffer && on_ground) {
 			vspd = JUMP_SPD;
 			on_ground = 0;
@@ -121,14 +121,15 @@ int main(void)
 			  {
 			    player_y += trunc_vspd;
 			  }
-			  else
-			  {
+        else
+        {
 				  int sign_vspd = sgn(trunc_vspd);
 				  while (!collide_solid(player_x, player_y + sign_vspd, level))
 				  {
 				    player_y += sign_vspd;
 				  }
 				  vspd = 0;
+          jump_hold = 0;
 			  }
       }
 		}