diff --git a/src/Fruit.cpp b/src/Fruit.cpp index 56f043c..3f6090a 100644 --- a/src/Fruit.cpp +++ b/src/Fruit.cpp @@ -2,17 +2,17 @@ #include #include -Fruit::Fruit(sf::Vector2i gridPos_in, const Color& color_in) +Fruit::Fruit(const sf::Vector2i gridPos_in, const Color& color_in) : gridPos(gridPos_in) , color(color_in) { } -sf::Vector2f Fruit::windowPos(sf::Vector2f gameBoundsOrigin, float size) const +sf::Vector2f Fruit::windowPos(sf::Vector2f gameBoundsOrigin, const float size) const { - return {gameBoundsOrigin.x + (gridPos.x * size), gameBoundsOrigin.y + (gridPos.y * size)}; + return {gameBoundsOrigin.x + (static_cast(gridPos.x) * size), gameBoundsOrigin.y + (static_cast(gridPos.y) * size)}; } -void Fruit::respawn(const std::vector& body_in, unsigned int gridCount_in) +void Fruit::respawn(const std::vector& body_in, const unsigned int gridCount_in) { unsigned int tempX; unsigned int tempY; @@ -20,8 +20,8 @@ void Fruit::respawn(const std::vector& body_in, unsigned int gridCoun do { valid = true; - tempX = Random::get(0, gridCount_in - 1); - tempY = Random::get(0, gridCount_in - 1); + tempX = Random::get(0u, gridCount_in - 1); + tempY = Random::get(0u, gridCount_in - 1); for (const auto& node : body_in) { if (node.gridPos.x == tempX and node.gridPos.y == tempY) diff --git a/src/Game.cpp b/src/Game.cpp index 759c300..6a13c0e 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -158,7 +158,7 @@ bool Game::parseConfigFile() if (inputBuff == "gridCount") { configFile >> config.gridCount; - config.gridCountBuffer = config.gridCount; + config.gridCountBuffer = static_cast(config.gridCount); continue; } @@ -598,8 +598,4 @@ void Game::run() } ImGui::SFML::Shutdown(); -} - -/* - * - */ \ No newline at end of file +} \ No newline at end of file diff --git a/src/Player.cpp b/src/Player.cpp index 4aaece5..2e0e4f3 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -7,7 +7,7 @@ SnakeNode::SnakeNode(sf::Vector2u gridPos_in, const Color& color_in) sf::Vector2f SnakeNode::windowPos(const sf::Vector2f gameBoundsOrigin, float size) const { - return {gameBoundsOrigin.x + (gridPos.x * size), gameBoundsOrigin.y + (gridPos.y * size)}; + return {gameBoundsOrigin.x + (static_cast(gridPos.x) * size), gameBoundsOrigin.y + (static_cast(gridPos.y) * size)}; } SnakeNode& Player::head() diff --git a/src/main.cpp b/src/main.cpp index ccb95a8..e236c54 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,6 @@ int main(int argc, char* argv[]) } LOG("\n\n\033[32mTODO: "); - LOG("-Implement game config via imgui"); LOG("\033[0m"); Game game(useImgui);