Fix (hopefully) one way collision

main.c

@@ -62,6 +62,11 @@ int main(void)
         // appear in the polling of raylib
         Scene_t* curr_scene = engine.scenes[engine.curr_scene];
 
+        if (curr_scene->state == SCENE_ENDED && engine.curr_scene == 0)
+        {
+            break;
+        }
+
         process_inputs(&engine, curr_scene);
 
         update_scene(curr_scene);
@@ -74,10 +79,6 @@ int main(void)
             sc_queue_clear(&key_buffer);
         }
 
-        if (curr_scene->state == SCENE_ENDED && engine.curr_scene == 0)
-        {
-            break;
-        }
     }
     free_sandbox_scene(&sandbox_scene);
     free_game_scene(&level_scene);

scenes/game_systems.c

@@ -45,10 +45,11 @@ static bool check_collision_and_move(
         // If there is collision, use previous overlap to determine direction
         find_AABB_overlap(p_ct->prev_position, p_bbox->size, *other_pos, other_bbox, &prev_overlap);
 
-        // Store collision event here
+        // Resolve collision via moving player by the overlap amount only if other is solid
-        // Check collision on x or y axis
+        // also check for empty to prevent creating new collision. Not fool-proof, but good enough
-        // Encode key and value, -ve is left and up, +ve is right and down
         Vector2 offset = {0, 0};
+        if (other_solid == SOLID)
+        {
             if (fabs(prev_overlap.y) > fabs(prev_overlap.x))
             {
                 offset.x = overlap.x;
@@ -65,27 +66,20 @@ static bool check_collision_and_move(
             {
                 offset.y = overlap.y;
             }
-
+        }
-        // Resolve collision via moving player by the overlap amount only if other is solid
+        else if (other_solid == ONE_WAY)
-        // also check for empty to prevent creating new collision. Not fool-proof, but good enough
+        {
-        //if (other_solid && !check_collision_at(ent_idx, p_ct->position, sz, tilemap, offset, p_manager))
+            // One way collision is a bit special
-        if ( other_solid == SOLID
+            if (
-            || (
+                p_ct->prev_position.y + p_bbox->size.y - 1 < other_pos->y
-                other_solid == ONE_WAY && offset.y  < 0
+                && p_ct->position.y + p_bbox->size.y - 1 >= other_pos->y
-                && (p_ct->prev_position.y + p_bbox->size.y - 1 < other_pos->y))
             )
             {
-            //if (!check_collision_offset(ent, p_ct->position, p_bbox->size, tilemap, offset))
+                offset.y = other_pos->y - (p_ct->position.y + p_bbox->size.y);
-            {
+            }
+        }
         p_ct->position = Vector2Add(p_ct->position, offset);
     }
-            //else 
-            {
-            
-                //*other_pos = Vector2Subtract(*other_pos, offset);
-            }
-        }
-    }
     else if (overlap_mode == 2)
     {
         if ( other_solid != SOLID ) goto collision_end;