Merge pull request #5 from martin-ramos/revert-4-fix_issue

Revert "Fix issue Snake freezes after eating last fruit"
alexdantas · Jul 4, 2018 · e1eee3e · e1eee3e
2 parents 5066ed0 + e6f4537
commit e1eee3e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 23 deletions.
diff --git a/lang/es_AR/LC_MESSAGES/nsnake.mo b/lang/es_AR/LC_MESSAGES/nsnake.mo
diff --git a/lang/es_AR/LC_MESSAGES/po/nsnake.po b/lang/es_AR/LC_MESSAGES/po/nsnake.po
@@ -285,7 +285,6 @@ msgid "(Help)"
 msgstr "(Ayuda)"
 msgid " Help "
 msgstr " Ayuda "
+
 msgid "Menu controls:\n"
 msgstr "Controles del menu\n"
-msgid "You win"
-msgstr "Has ganado"
diff --git a/src/Entities/Board.cpp b/src/Entities/Board.cpp
@@ -238,7 +238,4 @@ void Board::scrollDown()
 		this->board->set(j, 1, tmp);
 	}
 }
-int Board::getSize()
-{
-	return this->getW() * this->getH();
-}
+
diff --git a/src/Entities/Board.hpp b/src/Entities/Board.hpp
@@ -115,9 +115,6 @@ class Board
 	void scrollUp();
 	void scrollDown();
 
-	// Returns size of board
-	int getSize();
-
 private:
 	/// The actual level on the screen.
 	/// `true` means there's a wall here.
@@ -132,3 +129,4 @@ class Board
 };
 
 #endif //BOARD_H_DEFINED
+
diff --git a/src/Entities/Game.cpp b/src/Entities/Game.cpp
@@ -4,8 +4,6 @@
 #include <Display/Layouts/LayoutGame.hpp>
 #include <Engine/InputManager.hpp>
 #include <Entities/BoardParser.hpp>
-#include <Engine/Graphics/Widgets/Dialog.hpp>
-#include <unistd.h>
 
 #include <stdlib.h>
 
@@ -225,16 +223,9 @@ void Game::handleInput()
 }
 void Game::update()
 {
-	//Fix bug game freezes when snake eats last fruit
-	if((this->player->getSizeMinus(1)) >= this->board->getSize())
-	{
-		Dialog::show(_("You win"));
-		//Thread sleeps 2 seconds for dialog "You win"
-		usleep(2000000);
-		this->gameOver = true;
-	}
 	if (this->gameOver)
 		return;
+
 	// If we're paused, only handle the menu.
 	if (this->isPaused)
 	{

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
@@ -163,6 +163,4 @@ void Player::increase()
 
 	this->body.push_back(Body(lastx, lasty));
 }
-int Player::getSizeMinus(int count) {
-	return this->getSize() - count;
-}
+
diff --git a/src/Entities/Player.hpp b/src/Entities/Player.hpp
@@ -56,7 +56,6 @@ class Player
 	bool bodyHit(int x, int y, bool isCheckingHead=false);
 
 	void increase();
-	int getSizeMinus(int count);
 
 private:
 	std::vector<Body> body;
@@ -68,3 +67,4 @@ class Player
 };
 
 #endif //PLAYER_H_DEFINED
+