fix: merge conflict

This commit is contained in:
2026-07-05 21:20:59 +02:00
parent 421caaac01
commit cf79bcbfbc
5 changed files with 103 additions and 239 deletions
+1 -4
View File
@@ -108,11 +108,8 @@ typedef struct {
Animation animation;
Physics physics;
float rotation;
<<<<<<< HEAD
Sound soundFlapping;
=======
int health;
>>>>>>> origin/pirate
int gold;
} Player;
@@ -249,7 +246,7 @@ void UpdatePlayer(void);
void RenderPlayer(void);
Enemies CreateEnemies(void);
void UpdateEnemies(Enemies *enemies, Projectiles *projectiles);
void UpdateEnemies(Enemies *enemies);
void RenderEnemies(Enemies *enemies);
Birds CreateBirds(void);