diff --git a/GameSample/Fruits.h b/GameSample/Fruits.h index dcf7971..7caab43 100644 --- a/GameSample/Fruits.h +++ b/GameSample/Fruits.h @@ -17,20 +17,14 @@ class Fruits } void eat() { - updateFruit(*this, grid); grid.setSymbol(this->crd, this->symbol); } const COORD getCoords() const { return this->crd; } - - friend void updateFruit(Fruits& fruit, BaseGrid& grid); }; -void updateFruit(Fruits& fruit, BaseGrid& grid) { - fruit.crd.X = rand() % grid.getWidth(); - fruit.crd.Y = rand() % grid.getHeight(); - fruit.symbol = (rand() % 2 == 0) ? 42 : 43; -} + + diff --git a/GameSample/SnakeTheGame.h b/GameSample/SnakeTheGame.h index c049629..45c27de 100644 --- a/GameSample/SnakeTheGame.h +++ b/GameSample/SnakeTheGame.h @@ -21,13 +21,13 @@ class SnakeTheGame : public GameBase {} bool snakeOnFruit(Snake& snk, Fruits& fruit) { - return snk.getCoords() == fruit.getCoords(); + return snk.getCoords().X == fruit.getCoords().X && + snk.getCoords().Y == fruit.getCoords().Y; } void runGame() override { view.printMessage(); - Fruits fruit{ COORD{}, 0, view.getViewGrid() }; - updateFruit(fruit, view.getViewGrid()); + Fruits fruit{ {WIDTH / 4, HEIGHT / 4}, '%', view.getViewGrid()}; while (true) { view.drawLines(); controls.checkInput();