diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-18 17:48:29 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-18 17:49:00 +0200 |
| commit | f98d003e354a1792117b7cbc771d1dd91475a156 (patch) | |
| tree | dc2a297f7c4026394c9954ae4bfd4abd22ef9612 /src/gui/widgets/emoteshortcutcontainer.cpp | |
| parent | bb0a6cb25b2985fd1f74c9d27d5a46f6863e2dee (diff) | |
| download | manaverse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.gz manaverse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.bz2 manaverse-f98d003e354a1792117b7cbc771d1dd91475a156.tar.xz manaverse-f98d003e354a1792117b7cbc771d1dd91475a156.zip | |
Fix most old style cast except manaserv and libxml2 defines.
Diffstat (limited to 'src/gui/widgets/emoteshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/emoteshortcutcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 4abe279da..f6762a5cb 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -131,7 +131,7 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics) mEmoteImg[i]->sprite->draw(g, emoteX + 2, emoteY + 10); } - if (mEmoteMoved && mEmoteMoved < (unsigned)mEmoteImg.size() + 1 + if (mEmoteMoved && mEmoteMoved < static_cast<unsigned>(mEmoteImg.size()) + 1 && mEmoteMoved > 0) { // Draw the emote image being dragged by the cursor. @@ -245,7 +245,7 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event) mEmotePopup->setVisible(false); - if ((unsigned)index < mEmoteImg.size() && mEmoteImg[index]) + if (static_cast<unsigned>(index) < mEmoteImg.size() && mEmoteImg[index]) { mEmotePopup->show(viewport->getMouseX(), viewport->getMouseY(), mEmoteImg[index]->name); |