From 91dd615dac22bf465267e5e3ce145a8da81541d8 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 15 Jan 2007 18:04:26 +0000 Subject: Fixed issue where the player stops walking. --- ChangeLog | 7 ++++++- src/gui/menuwindow.cpp | 3 ++- src/gui/updatewindow.cpp | 6 +++--- src/gui/viewport.cpp | 2 +- src/gui/viewport.h | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d0e1492..7d14a9b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2007-01-15 Eugenio Favalli +2007-01-15 Bjørn Lindeijer + + * src/gui/viewport.cpp, src/gui/viewport.h: Fixed issue where the + player stops walking. + +2007-01-15 Eugenio Favalli * data/help/header.txt, NEWS, README: Updated release date. diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp index ba4c8e94..a5b5c99e 100644 --- a/src/gui/menuwindow.cpp +++ b/src/gui/menuwindow.cpp @@ -58,7 +58,8 @@ MenuWindow::MenuWindow(): }; int x = 0, y = 3, h = 0; - for (const char **curBtn = buttonNames; *curBtn; curBtn++) { + for (const char **curBtn = buttonNames; *curBtn; curBtn++) + { gcn::Button *btn = new Button(*curBtn, *curBtn, &listener); btn->setPosition(x, y); add(btn); diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index 628082d0..99c09baa 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -138,7 +138,7 @@ void UpdaterWindow::action(const gcn::ActionEvent &event) if (event.getId() == "cancel") { // Register the user cancel - mUserCancel=true; + mUserCancel = true; // Skip the updating process if (mDownloadStatus == UPDATE_COMPLETE) { @@ -372,13 +372,13 @@ void UpdaterWindow::logic() case UPDATE_ERROR: if (mThread) { - if(mUserCancel){ + if (mUserCancel) { // Kill the thread, because user has canceled SDL_KillThread(mThread); // Set the flag to false again mUserCancel = false; } - else{ + else { SDL_WaitThread(mThread, NULL); } mThread = NULL; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 03e008ba..90f3536c 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -348,7 +348,7 @@ Viewport::mousePressed(gcn::MouseEvent &event) } void -Viewport::mouseMoved(gcn::MouseEvent &event) +Viewport::mouseDragged(gcn::MouseEvent &event) { if (!mMap || !player_node) return; diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 80475fbf..f1cadd98 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -92,7 +92,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener, * Handles mouse move on map */ void - mouseMoved(gcn::MouseEvent &event); + mouseDragged(gcn::MouseEvent &event); /** * Handles mouse button release on map. -- cgit v1.2.3-70-g09d2