diff options
| author | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-03-01 22:03:01 +0100 |
| commit | 490862919d79369112c75955a9c36ff8a081efd3 (patch) | |
| tree | 6fe89466b9c53ba811f298174e6d787bbae71e09 /src/gui/spellpopup.cpp | |
| parent | dff814619d63496acd3c4e8730b828b5d4d931fb (diff) | |
| parent | d873da3e8e57480016596f714845c1bc7e712e68 (diff) | |
| download | manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz manaplus-490862919d79369112c75955a9c36ff8a081efd3.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/gui/spellpopup.cpp')
| -rw-r--r-- | src/gui/spellpopup.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp index 66d69b197..9446f7515 100644 --- a/src/gui/spellpopup.cpp +++ b/src/gui/spellpopup.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2008 The Legend of Mazzeroth Development Team * Copyright (C) 2009 The Mana World Development Team * Copyright (C) 2009-2010 Andrei Karas - * Copyright (C) 2011 ManaPlus developers + * Copyright (C) 2011-2012 The ManaPlus developers * * This file is part of The ManaPlus Client. * @@ -18,8 +18,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "gui/spellpopup.h" @@ -114,8 +113,6 @@ void SpellPopup::view(int x, int y) { if (y > getHeight() + distance) posY = y - getHeight() - distance; - else - y = 0; } setPosition(posX, posY); |