diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-15 18:04:26 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-01-15 18:04:26 +0000 |
| commit | 91dd615dac22bf465267e5e3ce145a8da81541d8 (patch) | |
| tree | c97fb0261010e3596daac06e00f9c1937e818185 /src | |
| parent | 37c4ff1d8c00c2215d0feeaa6ba0d86b9916e3af (diff) | |
| download | mana-91dd615dac22bf465267e5e3ce145a8da81541d8.tar.gz mana-91dd615dac22bf465267e5e3ce145a8da81541d8.tar.bz2 mana-91dd615dac22bf465267e5e3ce145a8da81541d8.tar.xz mana-91dd615dac22bf465267e5e3ce145a8da81541d8.zip | |
Fixed issue where the player stops walking.v0.0.22.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/menuwindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/updatewindow.cpp | 6 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 2 | ||||
| -rw-r--r-- | src/gui/viewport.h | 2 |
4 files changed, 7 insertions, 6 deletions
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. |