diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 19:43:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 19:43:40 +0300 |
| commit | 4484b433abc8f07bcf7d4d22fd946e00b66b078d (patch) | |
| tree | d8d04c6ea9526b90334e7b0a4abf44e2508a3597 /src/gui/textpopup.cpp | |
| parent | c1fb0bf9dc98e2a30f33cbbf4f74604b36efbcba (diff) | |
| download | manaverse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.gz manaverse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.bz2 manaverse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.xz manaverse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.zip | |
Fix first part of shadow variables/methods errors.
Diffstat (limited to 'src/gui/textpopup.cpp')
| -rw-r--r-- | src/gui/textpopup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index 1ff601154..65c712461 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -96,9 +96,9 @@ void TextPopup::show(int x, int y, const std::string &str1, int posX = std::max(0, x - getWidth() / 2); int posY = y + distance; - if (posX + getWidth() > graphics->mWidth) - posX = graphics->mWidth - getWidth(); - if (posY + getHeight() > graphics->mHeight) + if (posX + getWidth() > mainGraphics->mWidth) + posX = mainGraphics->mWidth - getWidth(); + if (posY + getHeight() > mainGraphics->mHeight) posY = y - getHeight() - distance; setPosition(posX, posY); |