diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
commit | 0c8c8cf7ea63def0d454f30227584a5f3062c013 (patch) | |
tree | 9929ddd6c0ecaffef0d75411eeaea2f9fa7fbdfd /src/localplayer.cpp | |
parent | 4ff5c3b854215b1f55e70106a4c53225fc953619 (diff) | |
download | mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.gz mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.bz2 mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.xz mana-client-0c8c8cf7ea63def0d454f30227584a5f3062c013.zip |
Revert "Merge WindowContainer into Viewport and remove extra members"
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
Diffstat (limited to 'src/localplayer.cpp')
-rw-r--r-- | src/localplayer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 8c918a97..750c8c45 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -103,6 +103,11 @@ LocalPlayer::LocalPlayer(int id, int job): mLocalWalkTime(-1), mMessageTime(0) { + // Variable to keep the local player from doing certain actions before a map + // is initialized. e.g. drawing a player's name using the TextManager, since + // it appears to be dependant upon map coordinates for updating drawing. + mMapInitialized = false; + mUpdateName = true; mTextColor = &guiPalette->getColor(Palette::PLAYER); |