From 0b2235dfff7f7c0f534746271ff66275297fd328 Mon Sep 17 00:00:00 2001 From: Roderic Morris Date: Fri, 24 Oct 2008 00:28:05 +0000 Subject: fixes for targetting (by Chuck Miller) --- src/gui/viewport.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/gui/viewport.cpp') diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 80dcf489..d086418f 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -298,18 +298,15 @@ void Viewport::drawTargetCursor(Graphics *graphics) Being::TargetCursorSize cursorSize = target->getTargetCursorSize(); Image* targetCursor; if (rangeX > attackRange || rangeY > attackRange) - { - targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); - } - else { - targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); - } + targetCursor = mTargetCursorOutRange[cursorSize]->getCurrentImage(); + else + targetCursor = mTargetCursorInRange[cursorSize]->getCurrentImage(); // Draw the target cursor at the correct position - int posX = target->getPixelX() + 16 - - targetCursor->getWidth() / 2 - (int) mViewX; - int posY = target->getPixelY() + 16 - - targetCursor->getHeight() / 2 - (int) mViewY; + int posX = target->getPixelX() - + targetCursor->getWidth() / 2 - (int) mViewX; + int posY = target->getPixelY() - 16 - + targetCursor->getHeight() / 2 - (int) mViewY; graphics->drawImage(targetCursor, posX, posY); } @@ -325,7 +322,7 @@ void Viewport::drawTargetName(Graphics *graphics) graphics->setColor(gcn::Color(255, 32, 32)); const MonsterInfo &mi = static_cast(target)->getInfo(); - int posX = target->getPixelX() + 16 - (int) mViewX; + int posX = target->getPixelX() - (int) mViewX; int posY = target->getPixelY() + 16 - target->getHeight() - (int) mViewY; graphics->drawText(mi.getName(), posX, posY, gcn::Graphics::CENTER); -- cgit v1.2.3-70-g09d2