From 05f0a438d54be5747eb2e3c46b17269240dff19c Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 20 Mar 2021 22:17:24 +0000 Subject: [PATCH] WIP collider --- !RunImage,ff8 | Bin 9852 -> 10308 bytes c/CTheEscape | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/!RunImage,ff8 b/!RunImage,ff8 index abe01f6ba3668cdb9910e5fc89fbba740cc35742..a61a2c1ea3ec34dff6778e257d388dfce97815ff 100644 GIT binary patch delta 3175 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 x2) + if(x1 <= (x2 + w2)) + if((y1 + h1) >= y2) + if(y1 <= (y2 + h2)) + return 1; + + return 0; +} + void game_input_tick() { if(debugs[dbbase]) @@ -518,6 +554,7 @@ void game_tick() game_input_tick(); game_tick_player(); game_tick_npcs(); + game_collider_tick(); game_draw_stars(); game_draw_player();