new language, new compiler

[l2e.git] / src / map / MapState.h

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 1901a67afc4b27f0f18943c4ceab2db4aa8a8eaf..8b9532db3bbbf7fb684bc4909a9dc6f77edba1ee 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -38,14 +38,21 @@ public:
 
 public:
        void AddEntity(Entity *e) { entities.push_back(e); }
-       void ControlEntity(Entity *e) { controlled = e; camera.SetTarget(&e->Position()); }
+       void ControlEntity(Entity *e) { controlled = e; TrackControlled(); }
+       void Track(math::Vector<math::Fixed<8> > *t) { camera.SetTarget(t); }
+       void TrackControlled() { if (controlled) Track(&controlled->Position()); }
 
-       void SetWalkingSpeed(math::Fixed<8> s) { walkingSpeed = s; }
+       math::Vector<math::Fixed<8> > TrackPoint() const { return *camera.GetTarget(); }
+
+       void SetWalkingSpeed(int s);
 
        void Transition(Map *, const math::Vector<int> &coordinates);
 
        virtual void HandleSyscall(common::ScriptRunner &);
 
+       const graphics::Camera &GetCamera() const { return camera; }
+       Map *GetMap() { return map; }
+
 private:
        virtual void OnEnterState(SDL_Surface *screen);
        virtual void OnExitState(SDL_Surface *screen);