From 3a5adfac6472e29cf6632f0c400c86b8da1c1674 Mon Sep 17 00:00:00 2001
From: Fcalva <fcalva@noreply.git.planet-casio.com>
Date: Mon, 11 Nov 2024 13:36:10 +0100
Subject: [PATCH] revert ce0a319a52122e65691494ee6c1d91838a43247c

revert Fix post-jam
---
 eng/moteur.c         |   1 +
 include/C3D/config.h |   4 ++--
 src/.game.c          | Bin 20480 -> 0 bytes
 src/game.c           |   5 ++++-
 src/gfx.c            |   2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 src/.game.c

diff --git a/eng/moteur.c b/eng/moteur.c
index c69e5ef..94f7814 100644
--- a/eng/moteur.c
+++ b/eng/moteur.c
@@ -37,6 +37,7 @@ void move(RcGame *game) {
   V2d *dir = &game->player.dir;
   V2d *pos = &game->player.pos;
   int map_w = game->current_map->w;
+  int map_h = game->current_map->h;
 
   fixed_t oldDirX;
   fixed_t oldPlaneX;
diff --git a/include/C3D/config.h b/include/C3D/config.h
index 5566c13..4355c05 100644
--- a/include/C3D/config.h
+++ b/include/C3D/config.h
@@ -7,7 +7,7 @@
 
 #define screen_w 128
 #define screen_h 64
-#define viewport_w 109
+#define viewport_w 100
 #define viewport_h 64
 #define max_dist fix(32)
 //Max sprites to attempt to render
@@ -32,6 +32,6 @@
 
 //===== Paramètres de debug =====
 
-#define debug 0 //pour afficher les infos de debug
+#define debug 1 //pour afficher les infos de debug
 
 #define asm_opti 0
diff --git a/src/.game.c b/src/.game.c
deleted file mode 100644
index 2115bd28cffc1286b9907a16a6e9129be96605df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
QrD&xswWz`@%N+Lp1I6y0@Bjb+

diff --git a/src/game.c b/src/game.c
index 6ff1e40..9113449 100644
--- a/src/game.c
+++ b/src/game.c
@@ -129,10 +129,13 @@ WeaponStat weapon_stats[] = {
 };
 
 void weapon_hurt_stuff(CCGame *game){
-  Sprite *hit = NULL;
+  Sprite *hit;
   int dist = raycast((RcGame*)game, &((RcGame*)game)->player, &hit);
   if(dist > weapon_stats[game->curr_weapon].range || !hit)
     return;
+  //:p
+  if(hit > 0x90000000)
+    return;
   hit->hp -= weapon_stats[game->curr_weapon].dmg;
 }
 
diff --git a/src/gfx.c b/src/gfx.c
index 36d3cb1..8b7e687 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -97,7 +97,7 @@ void draw_hands(CCGame *game){
 
 void draw_gui(CCGame *game){
   draw_hands(game);
-  dline(109,0,109,63,3);
+  dline(100,0,100,63,3);
   dprint_opt(127,10,3,C_NONE,DTEXT_RIGHT,DTEXT_TOP,"%d",game->_bgame.player.hp);
   //TODO : replace w/ icon
   dtext_opt(127,20,3,C_NONE,DTEXT_RIGHT,DTEXT_TOP,"HP",-1);