diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 15:17:51 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 15:17:51 +0100 |
| commit | 3efa949fca06f9a1cad04ff7da8107096ed55044 (patch) | |
| tree | a1c7eba105129a028631c5be222140c014a66ae6 /src/localplayer.cpp | |
| parent | e480ad5d269ca8dcd200397f7e6157b3e46c5c02 (diff) | |
| download | mana-3efa949fca06f9a1cad04ff7da8107096ed55044.tar.gz mana-3efa949fca06f9a1cad04ff7da8107096ed55044.tar.bz2 mana-3efa949fca06f9a1cad04ff7da8107096ed55044.tar.xz mana-3efa949fca06f9a1cad04ff7da8107096ed55044.zip | |
Simplified and fixed initialization of login data
Command line parameters were being overridden by old configuration
settings.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 6046459c..14b32415 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -519,7 +519,6 @@ void LocalPlayer::walk(unsigned char dir) #ifdef TMWSERV_SUPPORT const Vector &pos = getPosition(); - int dScaler; // Distance to walk #endif if (mAction == WALK && !mPath.empty()) @@ -554,7 +553,6 @@ void LocalPlayer::walk(unsigned char dir) dx++; #endif - // Prevent skipping corners over colliding tiles #ifdef TMWSERV_SUPPORT if (dx && !mMap->getWalk(((int) pos.x + dx) / 32, @@ -576,6 +574,8 @@ void LocalPlayer::walk(unsigned char dir) (pos.y + dy) / 32, getWalkMask())) dx = 16 - (int) pos.x % 32; + int dScaler; // Distance to walk + // Checks our path up to 5 tiles, if a blocking tile is found // We go to the last good tile, and break out of the loop for (dScaler = 1; dScaler <= 10; dScaler++) |