very bad collision(work in progress)

2026-06-22 01:41:15 -04:00
parent 22377c6f1a dff3a5d2c4
commit 21bd0c204e
3 changed files with 24 additions and 0 deletions
--- a/src/player.h
+++ b/src/player.h
@@ -3,8 +3,11 @@

 // FUNction declaration! yay!!!
 // run by main.c constantly to allow player input.
+<<<<<<< HEAD
 extern bool dir;
 extern float curhorvel;
+=======
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
 void UpdatePlayerControls(void);

 #endif