From 6bd6757583510ba3edf75451309e4b8ec8c9b0f1 Mon Sep 17 00:00:00 2001
From: "Juan J. Martinez" <jjm@usebox.net>
Date: Sun, 25 Jun 2023 22:44:23 +0100
Subject: Add entity system, add new enemy (snake)

---
 src/player.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/player.c')

diff --git a/src/player.c b/src/player.c
index 856cafd..ae50348 100644
--- a/src/player.c
+++ b/src/player.c
@@ -6,17 +6,14 @@
 #include "data.h"
 #include "game.h"
 
+#include "entities.h"
 #include "player.h"
 
-#define DIR_RIGHT 0
-#define DIR_LEFT 1
-
 #define FRAME_STANDING 0
 #define FRAME_JUMPING 4
 #define FRAME_DYING 5
 
 #define WALK_CYCLE_FRAMES 4
-#define WALK_DELAY 8
 
 #define GRAVITY_OFF 0
 /* XXX: subtract 1 to get the value from gravity_seq */
@@ -298,6 +295,18 @@ void player_draw()
     blitrc(binary_sprites_start, &frames[dir][frame], &dst);
 }
 
+uint8_t player_collision(Entity *e)
+{
+    if (invuln || dying)
+        return 0;
+
+    if (y < e->y + 16 && e->y < y + 16
+            && x < e->x + 8 && e->x < x + 8)
+        return 1;
+
+    return 0;
+}
+
 void player_hit()
 {
     /* TODO: pickaxe */
-- 
cgit v1.2.3