From 73981e35b85ce58da11a2fb0e5b7beb0c56c698b Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Thu, 22 Apr 2021 21:10:53 +0100
Subject: [PATCH] Use different boxes for visual colliding and physical.

---
 !TheEsc/!RunImage,ff8 | Bin 20796 -> 20996 bytes
 !TheEsc/Spr,ff9       | Bin 112952 -> 113272 bytes
 !TheEsc/c/Mission2    |  31 ++++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index 7e7448fcd0772f393f7ffaf6ef72a662cec3f1e1..05cc8b50d9d41fc384e3f315f35147470b0a9ab0 100644
GIT binary patch
delta 3110
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
N{HAoiKv!#Z{{_22#y|i7

delta 2959
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

diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9
index b98f6b7a1e2ecfd548ab68add573bad0927a00c4..ce8d8918ed66043c4755673f6eaf7551a008e093 100644
GIT binary patch
delta 695
zcmZWmu}T9$5Z&3BJ9CLiBu1i%q_9y;BOavj6SPpS7Ox6|hS*pMAtdP(ge~?btR$jX
zm>&@Q6OCdaTAXipZ;u4$Zg1Xu^X6u_d;E01zZ`FkF;>L6eCm1k9zFLq8)?SQ!ZtJ$
zE>bDR1>^?KEoZDC!rHa#`%T|xfjHn54+wXF5a-!)x7myt1d3lUm6Xp0%Ksd;76c5_
zi2SKu4M{nS2m`j5jXWn@sOaF>u+$|rCXr_Sijm&J8pwjg=o=}~6JQ<j7M$xzWZq|s
zOdRoSh8vO8MinqsCCl_@K%1(;h*VFh9M<;bWJGiF<%+5riFzw7wmP1OP8Y1;h~Jat
zge<Zsijvt3Ox|ozS&Um5aj}~hukEbt+>t8}2UNyShg<FqsFqXE^i8!Ctfq~O$#6*3
zhM9n89JbAlg{+{iil5Ya3P`^7siL-YImkPR7;}drG0CmQXuG&1j=2LiFF*RU0^mK2
IhBVmu14<H*sQ>@~

delta 591
zcmezIg>A<tHZEBP1_l8jw%OUpwUvu;U!&$5W(J1b#5|xF1h4}sJ}8?XNb3MG4-*3e
z|71s3@yQRoxF_cGPQKvAK6!#G_ryFt5VQV&2pljlz?nb>BN!lyAmkx(FcPK)CJz%w
z&=3{a<m(}dkQE@bA+ta#AO;|dBG|;s!@LI8n*%ig*#RgDu*##Wfar!f5XOUOh4Fy&
z<b!Tvps=5ukgYH|z>019jW$N1$q7sx7@WzUOr@qzYGo9gyf>YT@jpo8^Z;E(&WQy)
z;0Sz>o)3*cu<-O%t&CjLUu!W6Og6~lm_DVIQ3Rxs>Hq)9?@Z;UUut8N09mvBQyXKO
FF#y25ei{G(

diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index 66f516c..82020c4 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -33,6 +33,8 @@ struct TilePlayer_s {
   struct EntityLocation_s lastlocation;
   struct EntityLocation_s hitbox_bl;
   struct EntityLocation_s hitbox_tr;
+  struct EntityLocation_s drawbox_bl;
+  struct EntityLocation_s drawbox_tr;
   struct EntityLocation_s mapoffset;
   struct EntityLocation_s lastmapoffset;
   struct EntityLocation_s localtile;
@@ -202,12 +204,20 @@ void game2_setup()
   screen_clear();
   screen_flipbuffer();
   screen_clear();
+  
   TilePlayer.location.X = 125;
   TilePlayer.location.Y = 125;
-  TilePlayer.hitbox_bl.X = 0;
+  
+  TilePlayer.hitbox_bl.X = 30;
   TilePlayer.hitbox_bl.Y = 0;
   TilePlayer.hitbox_tr.X = 60;
-  TilePlayer.hitbox_tr.Y = 50;
+  TilePlayer.hitbox_tr.Y = 30;
+  
+  TilePlayer.drawbox_bl.X = 5;
+  TilePlayer.drawbox_bl.Y = 0;
+  TilePlayer.drawbox_tr.X = 60;
+  TilePlayer.drawbox_tr.Y = 75;
+  
   memset(map[0],0xFF,100);
   memset(map[1],0xFF,100);
   memset(map[2],0xFF,100);
@@ -354,8 +364,8 @@ int game2_tick()
       {
         // Finds any tile we collide with
         if(game_hitbox_collide(
-        (TilePlayer.location.X + TilePlayer.hitbox_bl.X),(TilePlayer.location.Y + TilePlayer.hitbox_bl.Y),
-        (TilePlayer.hitbox_tr.X - TilePlayer.hitbox_bl.X),(TilePlayer.hitbox_tr.Y - TilePlayer.hitbox_bl.Y),
+        (TilePlayer.location.X + TilePlayer.drawbox_bl.X),(TilePlayer.location.Y + TilePlayer.drawbox_bl.Y),
+        (TilePlayer.hitbox_tr.X - TilePlayer.drawbox_bl.X),(TilePlayer.drawbox_tr.Y - TilePlayer.drawbox_bl.Y),
         x*100,y*100,
         100,100
         ))
@@ -406,7 +416,18 @@ int game2_tick()
     game2_tick_input();
 
     draw_sprite("man",TilePlayer.location.X,TilePlayer.location.Y);
-
+    draw_rectangle(
+    (TilePlayer.location.X + TilePlayer.hitbox_bl.X),
+    (TilePlayer.location.Y + TilePlayer.hitbox_bl.Y),
+    (TilePlayer.location.X + TilePlayer.hitbox_tr.X),
+    (TilePlayer.location.Y + TilePlayer.hitbox_tr.Y)
+    );
+    draw_rectangle(
+    (TilePlayer.location.X + TilePlayer.drawbox_bl.X),
+    (TilePlayer.location.Y + TilePlayer.drawbox_bl.Y),
+    (TilePlayer.location.X + TilePlayer.drawbox_tr.X),
+    (TilePlayer.location.Y + TilePlayer.drawbox_tr.Y)
+    );
     return 0;
   }else{
 /*    screen_flipbuffer();