From 51a262ccae6d15fceaafe6062cf16d0ab34ac1b9 Mon Sep 17 00:00:00 2001
From: Massena <massena.fezard@yahoo.fr>
Date: Sat, 13 Mar 2021 21:57:18 +0100
Subject: [PATCH] spikes :D

---
 CMakeLists.txt          |   1 +
 assets-cg/img/spike.png | Bin 134 -> 169 bytes
 include/main.h          |   3 ++-
 src/levels.c            |  24 ++++++++++-----------
 src/main.c              |  45 ++++++++++++++++++++++++++++------------
 5 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06bdcb1..b06f075 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ set(ASSETS_fx
 set(ASSETS_cg
   assets-cg/img/player.png
   assets-cg/img/wall.png
+  assets-cg/img/spike.png
   # ...
 )
 
diff --git a/assets-cg/img/spike.png b/assets-cg/img/spike.png
index dfb89bfebdcf521800672b0c08fb939b4cc694b8..93a56dded228a700edc68add8144317ea9944ecc 100644
GIT binary patch
delta 127
zcmV-_0D%970jU9yF?eH1L_t(2k)4sj4Zt7_122e)G6734B}*^?E2WS2K`B86KO-xb
z*wS(`ZV7LVa{~x$N&s3;{l=v?w4BgVe-k2L4*>uzwWof_?hjh(lpGmSSm-b%@79_3
hh!Ala#c6(<Z~=*78s2L(Q*i(Q002ovPDHLkV1j)-FGT<V

delta 92
zcmZ3<*v2@)Fx0`*#W6%<VzQ0+s}J)TnIt3w7<c`sX9EH?HX%mtU7QgNUA`$d8&0RJ
vF$=!RAMrEgri0D`n<*FmHkm&2+{VaI7RA?C{6Jcd0SG)@{an^LB{Ts5x$7We

diff --git a/include/main.h b/include/main.h
index 34b24a5..80b02d3 100644
--- a/include/main.h
+++ b/include/main.h
@@ -14,4 +14,5 @@ struct Player {
 
 struct TwoValues search(int x, int level[16][16]);
 int collide_pixel(int x, int y, int obj, int level[16][16]);
-int collide(int x, int y, int obj, int level[16][16]);
+int collide(int x, int y, int h, int obj, int level[16][16]);
+struct Player level_reset(struct Player player);
\ No newline at end of file
diff --git a/src/levels.c b/src/levels.c
index a719636..3d2ef9b 100644
--- a/src/levels.c
+++ b/src/levels.c
@@ -1,18 +1,18 @@
 const int level[16][16] = {
 	{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},
+	{1, 3, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 3, 1},
+	{1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+	{1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1},
+	{1, 0, 0, 1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
 	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	{1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1},
+	{1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1},
+	{1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1},
+	{1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1},
 	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1},
-	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
-	{1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 1},
+	{1, 0, 0, 2, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1},
+	{1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1},
+	{1, 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 1},
 	{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}
 };
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 08f17e6..6f9ede8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,23 +29,30 @@ int collide_pixel(int x, int y, int obj, int level[LEVEL_SIZE][LEVEL_SIZE]) {
 	}
 }
 
-int collide(int x, int y, int obj, int level[LEVEL_SIZE][LEVEL_SIZE]) {
+int collide(int x, int y, int h, int obj, int level[LEVEL_SIZE][LEVEL_SIZE]) {
 	// Check if there's something in
 	// the square (x + 1, y + 1, x + 11, y + 11)
-	if( collide_pixel(x / TILE_SIZE, y / TILE_SIZE, obj, level) ||
-		collide_pixel(x / TILE_SIZE, (y + TILE_SIZE - 1) / TILE_SIZE, obj, level) ||
-		collide_pixel((x + TILE_SIZE - 1) / TILE_SIZE, y / TILE_SIZE, obj, level) ||
-		collide_pixel((x + TILE_SIZE - 1) / TILE_SIZE, (y + TILE_SIZE - 1) / TILE_SIZE, obj, level)
+	// The size of the hitbox changes with h
+	if( collide_pixel((x + h) / TILE_SIZE, (y + h) / TILE_SIZE, obj, level) ||
+		collide_pixel((x + h) / TILE_SIZE, (y + TILE_SIZE - h - 1) / TILE_SIZE, obj, level) ||
+		collide_pixel((x + TILE_SIZE - h - 1) / TILE_SIZE, (y + h) / TILE_SIZE, obj, level) ||
+		collide_pixel((x + TILE_SIZE - h - 1) / TILE_SIZE, (y + TILE_SIZE - h - 1) / TILE_SIZE, obj, level)
 		) {
 		return 1;
 	}
 	return 0;
 }
 
+struct Player level_reset(struct Player player) {
+	player.pos = player.spawn;
+	return player;
+}
+
 int main(void)
 {
 	extern bopti_image_t img_player;
 	extern bopti_image_t img_wall;
+	extern bopti_image_t img_spike;
 
 	extern int level[LEVEL_SIZE][LEVEL_SIZE];
 
@@ -57,39 +64,51 @@ int main(void)
 		.spawn = {0, 0}
 	};
 	player.spawn = search(2, level);
-	player.pos = player.spawn;
+	player = level_reset(player);
 
 	// main loop
 	while(running) {
 
 		dclear(C_BLACK);
 
-		// drawing the player
-		dimage(player.pos.x, player.pos.y, &img_player);
-
 		// drawing the level
 		for(int m = 0; m < LEVEL_SIZE; ++m) {
 			for(int n = 0; n < LEVEL_SIZE; ++n) {
-				if(level[n][m] == 1) {
-					dimage(m * TILE_SIZE, n * TILE_SIZE, &img_wall);
+				switch(level[n][m]) {
+					case 1:
+						// walls
+						dimage(m * TILE_SIZE, n * TILE_SIZE, &img_wall);
+						break;
+					case 3:
+						// spikes
+						dimage(m * TILE_SIZE, n * TILE_SIZE, &img_spike);
+						break;
 				}
 			}
 		}
 
+		// drawing the player
+		dimage(player.pos.x, player.pos.y, &img_player);
+
 		dupdate();
 		int mov_x = keydown(KEY_RIGHT) - keydown(KEY_LEFT);
 		int mov_y = keydown(KEY_DOWN) - keydown(KEY_UP);
 		clearevents();
 
 		// trying to move the player >w<
-		if(!collide(player.pos.x + mov_x, player.pos.y, 1, level)) {
+		if(!collide(player.pos.x + mov_x, player.pos.y, 0, 1, level)) {
 			player.pos.x += mov_x;
 		}
 
-		if(!collide(player.pos.x, player.pos.y + mov_y, 1, level)) {
+		if(!collide(player.pos.x, player.pos.y + mov_y, 0, 1, level)) {
 			player.pos.y += mov_y;
 		}
 
+		// d i e
+		if(collide(player.pos.x + mov_x, player.pos.y + mov_y, 2, 3, level)) {
+			player = level_reset(player);
+		}
+
 		if(keydown(KEY_EXIT)) {running = 0;}
 	}