diff options
author | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
---|---|---|
committer | Ira Rice <irarice@gmail.com> | 2008-09-25 00:15:44 +0000 |
commit | 489a429bea6739dfa25503b9329bd9e33bffb856 (patch) | |
tree | 8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/gui/viewport.h | |
parent | 2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff) | |
download | mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2 mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz mana-client-489a429bea6739dfa25503b9329bd9e33bffb856.zip |
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/gui/viewport.h')
-rw-r--r-- | src/gui/viewport.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/gui/viewport.h b/src/gui/viewport.h index 44a877a6..325a7221 100644 --- a/src/gui/viewport.h +++ b/src/gui/viewport.h @@ -18,7 +18,7 @@ * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: viewport.h 4247 2008-05-19 10:48:18Z b_lindeijer $ + * $Id$ */ #ifndef _TMW_VIEWPORT_H_ @@ -117,16 +117,16 @@ class Viewport : public WindowContainer, public gcn::MouseListener, optionChanged(const std::string &name); /** - * Returns camera x offset in tiles. + * Returns camera x offset in pixels. */ int - getCameraX() { return mTileViewX; } + getCameraX() const { return (int) mPixelViewX; } /** - * Returns camera y offset in tiles. + * Returns camera y offset in pixels. */ int - getCameraY() { return mTileViewY; } + getCameraY() const { return (int) mPixelViewY; } /** * Changes viewpoint by relative pixel coordinates. @@ -138,22 +138,13 @@ class Viewport : public WindowContainer, public gcn::MouseListener, /** * Helper function for loading target cursors */ - void - loadTargetCursor(std::string filename, int width, int height, - bool outRange, Being::TargetCursorSize size); + void loadTargetCursor(std::string filename, int width, int height, + bool outRange, Being::TargetCursorSize size); /** * Draws range based target cursor */ - void - drawTargetCursor(Graphics *graphics); - - /** - * Draws target name - */ - void - drawTargetName(Graphics *graphics); - + void drawTargetCursor(Graphics *graphics); Map *mMap; /**< The current map. */ |