From 7f819e46b584145e2cf2ea742ced9fab0ffc233e Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 26 Nov 2006 14:20:50 +0000 Subject: Made Being::mDirection protected, forcing the use of setDirection. Defaulted variant argument to 0 since this is the most common situation. Some SpriteDef refactoring, splitting up the loading into several methods, in preparation of adding support for including other sprites. --- src/game.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 7da80069..6bc37365 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -518,13 +518,13 @@ void Game::handleInput() if (!item) { Uint16 x = player_node->mX; Uint16 y = player_node->mY; - if (player_node->mDirection & Being::UP) + if (player_node->getDirection() & Being::UP) y--; - if (player_node->mDirection & Being::DOWN) + if (player_node->getDirection() & Being::DOWN) y++; - if (player_node->mDirection & Being::LEFT) + if (player_node->getDirection() & Being::LEFT) x--; - if (player_node->mDirection & Being::RIGHT) + if (player_node->getDirection() & Being::RIGHT) x++; item = floorItemManager->findByCoordinates(x, y); @@ -692,13 +692,13 @@ void Game::handleInput() { Uint16 targetX = x, targetY = y; - if (player_node->mDirection & Being::UP) + if (player_node->getDirection() & Being::UP) targetY--; - if (player_node->mDirection & Being::DOWN) + if (player_node->getDirection() & Being::DOWN) targetY++; - if (player_node->mDirection & Being::LEFT) + if (player_node->getDirection() & Being::LEFT) targetX--; - if (player_node->mDirection & Being::RIGHT) + if (player_node->getDirection() & Being::RIGHT) targetX++; // Attack priorioty is: Monster, Player, auto target -- cgit v1.2.3-70-g09d2