From 5a19d993ed65b474e0173d58f6f853b7a944e584 Mon Sep 17 00:00:00 2001 From: DarthMooMancer Date: Wed, 22 Oct 2025 20:51:30 -0400 Subject: [PATCH] os specifc locations for fonts --- src/main.cpp | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 10fd0d9..0a94302 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -120,21 +120,39 @@ int main() { for(int i = 0; i < MAX_ROWS; i++) { for(int j = 0; j < MAX_COLS; j++) { if(wall_list[i][j] == nullptr) continue; - auto collision = wall_list[i][j]->find_intersection(player); + auto collision = player.find_intersection(*wall_list[i][j]); if(collision == CollisionDir::None) continue; switch (collision) { case CollisionDir::Bottom: player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y - player.rect.getSize().y }); player.set_velocity_y(0); break; - case CollisionDir::Top: - player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getSize().y }); - player.set_velocity_y(0); - break; default: break; } } } + // for(int i = 0; i < MAX_ROWS; i++) { + // for(int j = 0; j < MAX_COLS; j++) { + // if(wall_list[i][j] == nullptr) continue; + // auto collision = player.find_intersection(*wall_list[i][j]); + // // auto collision = wall_list[i][j]->find_intersection(player); + // if(collision == CollisionDir::None) continue; + // switch (collision) { + // case CollisionDir::Bottom: + // player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y - player.rect.getSize().y }); + // player.set_velocity_y(0); + // break; + // // case CollisionDir::Top: + // // player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getOutlineThickness()}); + // // player.set_velocity_y(0); + // // std::cout << "Collision top\n"; + // // player.rect.setPosition({ player.rect.getPosition().x, wall_list[i][j]->rect.getPosition().y + player.rect.getSize().y }); + // // player.set_velocity_y(0); + // break; + // default: break; + // } + // } + // } float groundY = line.rect.getPosition().y - line.rect.getSize().y - player.rect.getSize().y - line_data.border_size - player_data.border_size; if (player.rect.getPosition().y >= groundY) {