diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-07-23 13:30:43 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-07-23 13:30:43 +0000 |
| commit | 2aa377c9f3c5a1a6079be6c91a14777a357e270a (patch) | |
| tree | ba308874148089e319f2ca796964d089d9beb344 /src/game.cpp | |
| parent | a9f0bca7aab054aae146a4044a4a904d0c54020b (diff) | |
| download | mana-2aa377c9f3c5a1a6079be6c91a14777a357e270a.tar.gz mana-2aa377c9f3c5a1a6079be6c91a14777a357e270a.tar.bz2 mana-2aa377c9f3c5a1a6079be6c91a14777a357e270a.tar.xz mana-2aa377c9f3c5a1a6079be6c91a14777a357e270a.zip | |
Removed knowledge about the engine and maps from the being class..
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/game.cpp b/src/game.cpp index 3d963421..4feb097e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -675,11 +675,13 @@ void do_input() Direction = NE; } + Map *tiledMap = engine->getCurrentMap(); + // Allow keyboard control to interrupt an existing path if ((xDirection != 0 || yDirection != 0) && player_node->action == WALK) - player_node->setDestination(x, y); - - Map *tiledMap = engine->getCurrentMap(); + player_node->setPath(tiledMap->findPath( + player_node->x, player_node->y, + x, y)); if (player_node->action != WALK) { @@ -699,7 +701,9 @@ void do_input() tiledMap->getWalk(x + xDirection, y + yDirection)) { walk(x + xDirection, y + yDirection, Direction); - player_node->setDestination(x + xDirection, y + yDirection); + player_node->setPath(tiledMap->findPath( + player_node->x, player_node->y, + x + xDirection, y + yDirection)); } else if (Direction != DIR_NONE) { @@ -978,14 +982,12 @@ void do_parse() being->action = STAND; being->x = get_src_x(RFIFOP(50)); being->y = get_src_y(RFIFOP(50)); - being->destX = get_dest_x(RFIFOP(50)); - being->destY = get_dest_y(RFIFOP(50)); being->speed = RFIFOW(6); being->job = RFIFOW(14); - //being->setWeapon(RFIFOW(18)); - being->setDestination( - get_dest_x(RFIFOP(50)), - get_dest_y(RFIFOP(50))); + being->setPath(tiledMap->findPath( + being->x, being->y, + get_dest_x(RFIFOP(50)), + get_dest_y(RFIFOP(50)))); break; case SMSG_MOVE_PLAYER_BEING: @@ -1004,15 +1006,14 @@ void do_parse() being->job = RFIFOW(14); being->x = get_src_x(RFIFOP(50)); being->y = get_src_y(RFIFOP(50)); - being->destX = get_dest_x(RFIFOP(50)); - being->destY = get_dest_y(RFIFOP(50)); being->setHairStyle(RFIFOW(16)); being->setWeaponById(RFIFOW(18)); being->setHairColor(RFIFOW(32)); - being->setDestination( - get_dest_x(RFIFOP(50)), - get_dest_y(RFIFOP(50))); + being->setPath(tiledMap->findPath( + being->x, being->y, + get_dest_x(RFIFOP(50)), + get_dest_y(RFIFOP(50)))); break; // NPC dialog |