diff options
| -rw-r--r-- | ChangeLog | 41 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 4 | ||||
| -rw-r--r-- | src/localplayer.cpp | 6 | ||||
| -rw-r--r-- | src/localplayer.h | 4 |
4 files changed, 30 insertions, 25 deletions
@@ -1,22 +1,27 @@ +2006-12-11 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/updatewindow.cpp: Fixed visibility of the update window. + 2006-12-11 Philipp Sehmisch <tmw@crushnet.org> - * data/equipment.xml, data/items.xml, - data/graphics/sprites/chest-tnecksweater-male.png, - data/graphics/sprites/chest-tnecksweater-female.png, - data/graphics/sprites/chest-vnecksweater-male.png, - data/graphics/sprites/chest-vnecksweater-female.png, - data/graphics/sprites/chest-tnecksweater-male.xml, - data/graphics/sprites/chest-tnecksweater-female.xml, - data/graphics/sprites/chest-vnecksweater-male.xml, - data/graphics/sprites/chest-vnecksweater-female.xml, - data/graphics/sprites/Makefile.AM, data/graphics/sprites/CMakeLists.txt, - data/graphics/items/armor-chest-vnecksweater.png, - data/graphics/items/armor-chest-tnecksweater.png, - data/graphics/items/armor-chest-woolsweater.png, - data/graphics/items/Makefile.AM, data/graphics/items/CMakeLists.txt: - Added new sweaters by Saphy. Info for server admins: Item IDs are 564 for - turtleneck (should already be in there) and 624 for v-neck. The visible - sprite IDs are 19 for turtleneck and 20 for v-neck. + * data/equipment.xml, data/items.xml, + data/graphics/sprites/chest-tnecksweater-male.png, + data/graphics/sprites/chest-tnecksweater-female.png, + data/graphics/sprites/chest-vnecksweater-male.png, + data/graphics/sprites/chest-vnecksweater-female.png, + data/graphics/sprites/chest-tnecksweater-male.xml, + data/graphics/sprites/chest-tnecksweater-female.xml, + data/graphics/sprites/chest-vnecksweater-male.xml, + data/graphics/sprites/chest-vnecksweater-female.xml, + data/graphics/sprites/Makefile.AM, + data/graphics/sprites/CMakeLists.txt, + data/graphics/items/armor-chest-vnecksweater.png, + data/graphics/items/armor-chest-tnecksweater.png, + data/graphics/items/armor-chest-woolsweater.png, + data/graphics/items/Makefile.AM, data/graphics/items/CMakeLists.txt: + Added new sweaters by Saphy. Info for server admins: Item IDs are 564 + for turtleneck (should already be in there) and 624 for v-neck. The + visible sprite IDs are 19 for turtleneck and 20 for v-neck. 2006-12-11 Eugenio Favalli <elvenprogrammer@gmail.com> @@ -257,7 +262,7 @@ * src/gui/gui.h: Added mouseMotion(), mouseRelease() and private variables for mouse following. -2006-11-05 Philipp Sehmisch <tmw@crushnet.org> +2006-11-15 Philipp Sehmisch <tmw@crushnet.org> * data/graphics/tiles/Woodland_village.png, data/graphics/tiles/Woodland_village_x2.png, diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index d8244d37..a23438cb 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -83,8 +83,9 @@ UpdaterWindow::UpdaterWindow(): add(mCancelButton); add(mPlayButton); - mCancelButton->requestFocus(); setLocationRelativeTo(getParent()); + setVisible(true); + mCancelButton->requestFocus(); mUpdateHost = config.getValue("updatehost", "http://updates.themanaworld.org"); @@ -179,7 +180,6 @@ void UpdaterWindow::loadNews() mMemoryBuffer = NULL; mScrollArea->setVerticalScrollAmount(0); - setVisible(true); } void UpdaterWindow::addRow(const std::string &row) diff --git a/src/localplayer.cpp b/src/localplayer.cpp index d5484ac3..f842042c 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -232,10 +232,10 @@ void LocalPlayer::walk(unsigned char dir) void LocalPlayer::setDestination(Uint16 x, Uint16 y) { // Only send a new message to the server when destination changes - if (x != destX || y != destY) + if (x != mDestX || y != mDestY) { - destX = x; - destY = y; + mDestX = x; + mDestY = y; char temp[3]; MessageOut outMsg(mNetwork); diff --git a/src/localplayer.h b/src/localplayer.h index 04477af2..7cad9bc4 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -162,8 +162,8 @@ class LocalPlayer : public Player bool mTrading; int mLastAction; /**< Time stamp of the last action, -1 if none. */ int mWalkingDir; /**< The direction the player is walking in. */ - int destX; /**< X coordinate of destination. */ - int destY; /**< Y coordinate of destination. */ + int mDestX; /**< X coordinate of destination. */ + int mDestY; /**< Y coordinate of destination. */ }; extern LocalPlayer *player_node; |