Merged revisions 3828-3829,3831-3838,3841,3843-3844,3847-3872,3874,3876-3900 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0

........
  r3828 | crush_tmw | 2007-12-31 17:14:27 +0100 (Mon, 31 Dec 2007) | 1 line
  
  Added config options to set the scroll center. Retained scroll offset during map change for smoother map transitions.
........
  r3859 | b_lindeijer | 2008-01-26 20:38:43 +0100 (Sat, 26 Jan 2008) | 3 lines
  
  Fixed a GCC 4.3 compile error and constified the usage of auto_ptr, since
  that's the way in which we are using them.
........
  r3876 | crush_tmw | 2008-02-11 20:00:43 +0100 (Mon, 11 Feb 2008) | 1 line
  
  Added music and overlay to snake dungeon.
........
  r3883 | crush_tmw | 2008-02-12 15:00:22 +0100 (Tue, 12 Feb 2008) | 1 line
  
  Particle emitters are now activated after the parent particle has moved instead of before (small change which allows a little trick to create polar emitters)
........
  r3887 | umperio | 2008-02-12 20:49:37 +0100 (Tue, 12 Feb 2008) | 1 line
  
  Made pathfinding not halt on collision destination tile, made moving around with mouse smoother. Added possibility to pass through players with key controls.
........
  r3888 | crush_tmw | 2008-02-13 21:49:55 +0100 (Wed, 13 Feb 2008) | 1 line
  
  Added new headgears by Black Don (thanks to QOAL for testing and implementation)
........
  r3891 | umperio | 2008-02-18 09:52:06 +0100 (Mon, 18 Feb 2008) | 1 line
  
  Fixed image name.
........
  r3892 | umperio | 2008-02-18 11:00:45 +0100 (Mon, 18 Feb 2008) | 1 line
  
  Forgot a %s
........
  r3899 | crush_tmw | 2008-02-19 14:23:34 +0100 (Tue, 19 Feb 2008) | 1 line
  
  Map fixes at snake dungeon by QOAL
........
  r3900 | crush_tmw | 2008-02-19 14:32:24 +0100 (Tue, 19 Feb 2008) | 1 line
  
  More map fixes at snake dungeon by QOAL
........

1 files changed, 12 insertions, 6 deletions

diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 1547c0a4..c8f7a9ec 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -117,16 +117,22 @@ 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 mCameraX; }
+        getCameraX() const { return (int) mViewX; }
 
         /**
-         * Returns camera y offset in tiles.
+         * Returns camera y offset in pixels.
          */
         int
-        getCameraY() { return mCameraY; }
+        getCameraY() const { return (int) mViewY; }
+
+        /**
+         * Changes viewpoint by relative pixel coordinates.
+         */
+        void
+        scrollBy(float x, float y) { mViewX += x; mViewY += y; }
 
     private:
         /**
@@ -156,10 +162,10 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
         int mScrollRadius;
         int mScrollLaziness;
+        int mScrollCenterOffsetX;
+        int mScrollCenterOffsetY;
         float mViewX;              /**< Current viewpoint in pixels. */
         float mViewY;              /**< Current viewpoint in pixels. */
-        int mCameraX;              /**< Current viewpoint in tiles. */
-        int mCameraY;              /**< Current viewpoint in tiles. */
         bool mShowDebugPath;       /**< Show a path from player to pointer. */
 
         /** Images of in range target cursor. */