diff --git a/game.cpp b/game.cpp index 55e866c..667bb24 100644 --- a/game.cpp +++ b/game.cpp @@ -4,7 +4,7 @@ Game::Game() :max_x(1000), max_y(800), direction(0), window(sf::VideoMode(max_x, max_y), "SFML Window"), - racecar(300.0f, 30.0f, 1.7f) { // maxSpeed, acceleration, and steerSpeed values + racecar(400.0f, 30.0f, 1.7f) { // maxSpeed, acceleration, and steerSpeed values if (!font.loadFromFile("cascaydia.otf")) { std::cerr << "Failed to load font" << std::endl; exit(1); @@ -68,17 +68,15 @@ void Game::run() { speedText.setString(std::to_string(static_cast(racecar.getSpeed())) + " km/h"); speedText.setCharacterSize(24); speedText.setFillColor(sf::Color::Green); - speedText.setPosition(10, 770); + speedText.setPosition(racecar.getX() - 475, racecar.getY() + 350); if(racecar.getSpeed() < 0){ speedText.setFillColor(sf::Color::Blue); } - if(racecar.getSpeed() >= 150){ - speedText.setPosition(10, 767); + if(racecar.getSpeed() >= 250){ speedText.setCharacterSize(27); speedText.setFillColor(sf::Color::Yellow); } - if(racecar.getSpeed() >= 260){ - speedText.setPosition(10, 764); + if(racecar.getSpeed() >= 360){ speedText.setCharacterSize(30); speedText.setFillColor(sf::Color::Red); } diff --git a/game.h b/game.h index 506f464..5a83dd9 100644 --- a/game.h +++ b/game.h @@ -30,11 +30,11 @@ private: "/ | / \\ _____ __________________ .___.___ / / \n" "| || | / _ \\ / _____/\\_ ___ \\| | | / / \n" "| || | / /_\\ \\ \\_____ \\ / \\ \\/| | | / / \n" - "| || __________________________ | / | \\/ \\ \\___| | | / / \n" + "| || __________________________ | / | \\/ \\\\ \\___| | | / / \n" "| || / \\ | \\____|__ /_______ / \\______ /___|___| / / \n" "| || / | | \\/ \\/ \\/ / / \n" - "| || | | | __________ _____ _________ _____________________ / / \n" - "| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n" + "| || | | | __________ _____ _________ _____________________ / / \n" + "| || | / / \\______ \\ / _ \\ \\_ ___ \\_ _____/\\______ \\ / / \n" "| || | / / | _/ / /_\\ \\/ \\ \\/ | __)_ | _/ / / \n" "| || | / / | | \\/ | \\ \\____| \\ | | \\ / / \n" "| || | / / |____|_ /\\____|__ /\\______ /_______ / |____|_ / / / \n" diff --git a/racecar.cpp b/racecar.cpp index 8c20f26..79c5f57 100644 --- a/racecar.cpp +++ b/racecar.cpp @@ -26,11 +26,14 @@ void Racecar::accelerate(float dt) { } void Racecar::decelerate(float dt) { - if (speed < 0) { + if (speed < -1) { speed += 3 * acceleration * dt; - } else if (speed > 0) { + } else if (speed > 1) { speed -= 3 * acceleration * dt; } + else { + speed = 0; + } } void Racecar::steer(float dt, float direction) { @@ -39,11 +42,13 @@ void Racecar::steer(float dt, float direction) { } void Racecar::brake(float dt) { - if (speed > 0) { + if (speed < -1) { + speed += 9 * acceleration * dt; + } else if (speed > 1) { speed -= 9 * acceleration * dt; } - if (speed < 0) { - speed += 9 * acceleration * dt; + else { + speed = 0; } } diff --git a/terminal_racer b/terminal_racer index 87573dc..2f2e9eb 100755 Binary files a/terminal_racer and b/terminal_racer differ