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/collision.c
+++ b/src/collision.c
@@ -2,7 +2,10 @@
 #include <math.h>
 #include "config.h"
 #include "collision.h"
+<<<<<<< HEAD
 #include "player.h"
+=======
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619

 void checkCollision(){
    float playerx=0.0;
@@ -21,6 +24,7 @@ void checkCollision(){
            if(playerx-(plrsize/2)<objposx+(objsize/2) && playerx-(plrsize/2)>objposx-(objsize/2)){
                ApplyForce(
                    e,
+<<<<<<< HEAD
                    (Vector2){10000, 1000}
                );
                if(dir){
@@ -35,6 +39,14 @@ void checkCollision(){
                    (Vector2){-(curhorvel*3), 1000}
                );
                }
+=======
+                    (Vector2){1000, 1000}
+                );
+                ApplyForce(
+                    player,
+                    (Vector2){-1000, 1000}
+                );
+>>>>>>> dff3a5d2c4b8cd3d6d86ab9792e394cd0d27a619
            }
        }
        else{