diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-06-08 15:17:58 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-06-08 15:17:58 +0200 |
| commit | c79d89473114756edfc426a2b93149056031fae1 (patch) | |
| tree | 09b2c084e508a886546f8fc422d882fbe4386a82 /src | |
| parent | 263fc757297103935cbdaa1bb6eca14ff8e75ecd (diff) | |
| parent | b00467d5bbf775dcd60d0f2e60eded3f9289729b (diff) | |
| download | Mana-c79d89473114756edfc426a2b93149056031fae1.tar.gz Mana-c79d89473114756edfc426a2b93149056031fae1.tar.bz2 Mana-c79d89473114756edfc426a2b93149056031fae1.tar.xz Mana-c79d89473114756edfc426a2b93149056031fae1.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/localplayer.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 782a461a..2f8761e7 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -440,9 +440,9 @@ void LocalPlayer::walk(unsigned char dir) int dScaler; // Distance to walk - // Checks our path up to 2 tiles, if a blocking tile is found + // Checks our path up to 1 tiles, if a blocking tile is found // We go to the last good tile, and break out of the loop - for (dScaler = 1; dScaler <= 2; dScaler++) + for (dScaler = 1; dScaler <= 1; dScaler++) { if ( (dx || dy) && !mMap->getWalk( ((int) pos.x + (dx * dScaler)) / 32, diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index c1b7cc84..58167339 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -223,9 +223,7 @@ void PlayerHandler::handleMessage(MessageIn &msg) switch (type) { - //case 0x0000: - // player_node->setWalkSpeed(msg.readInt32()); - // break; + case 0x0000: player_node->setWalkSpeed(value); break; case 0x0005: player_node->setHp(value); break; case 0x0006: player_node->setMaxHp(value); break; case 0x0007: player_node->mMp = value; break; |