diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-28 16:14:15 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-28 16:14:15 +0300 |
| commit | 226202ff807dc860991af0d6665ef9e9b48c1bed (patch) | |
| tree | de0be738585f3ab2556865c206981d2d2842ac69 /src/gui/windows | |
| parent | eb62e14c838788ae7691567a90bf7fe4940d5687 (diff) | |
| download | manaplus-226202ff807dc860991af0d6665ef9e9b48c1bed.tar.gz manaplus-226202ff807dc860991af0d6665ef9e9b48c1bed.tar.bz2 manaplus-226202ff807dc860991af0d6665ef9e9b48c1bed.tar.xz manaplus-226202ff807dc860991af0d6665ef9e9b48c1bed.zip | |
Move direct SDL_GetMouseState calls into method in gui class.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 5 | ||||
| -rw-r--r-- | src/gui/windows/equipmentwindow.cpp | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 62a032341..6af18ff06 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1911,11 +1911,14 @@ void ChatWindow::draw(gcn::Graphics* graphics) void ChatWindow::updateVisibility() { + if (!gui) + return; + int mouseX = 0; int mouseY = 0; int x = 0; int y = 0; - SDL_GetMouseState(&mouseX, &mouseY); + gui->getMouseState(&mouseX, &mouseY); getAbsolutePosition(x, y); if (mChatInput->isVisible()) { diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index f521f4b9b..cd04aaf99 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -425,9 +425,6 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event) if (item) { - int mouseX, mouseY; - SDL_GetMouseState(&mouseX, &mouseY); - mItemPopup->setItem(item); mItemPopup->position(x + getX(), y + getY()); } |