added textual type/field descriptions and wiki mode

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

diff --git a/src/map/Entity.h b/src/map/Entity.h
index 92b1b7cf1a4ccf6cff5d3b8776ab35cd6594ba84..3ddc9ccef49f5340680882be332ae216cbb1c259 100644 (file)
--- a/src/map/Entity.h
+++ b/src/map/Entity.h
@@ -41,8 +41,8 @@ public:
        geometry::Vector<float> &Velocity() { return velocity; }
        const geometry::Vector<float> &Velocity() const { return velocity; }
 
-       geometry::Vector<float> &SpriteOffset() { return spriteOffset; }
-       const geometry::Vector<float> &SpriteOffset() const { return spriteOffset; }
+       geometry::Vector<int> &SpriteOffset() { return spriteOffset; }
+       const geometry::Vector<int> &SpriteOffset() const { return spriteOffset; }
 
        void SetAnimation(const graphics::Animation *a);
        void StartAnimation(app::Application &ctrl);
@@ -56,6 +56,10 @@ public:
 
        void SetFlags(int f) { flags = f; }
        bool Blocking() const { return !(flags & FLAG_NONBLOCKING); }
+       bool Hostile() const {
+               // NOTE: this is a stub for testing!
+               return Blocking();
+       }
 
        Entity *Follower() { return follower; }
        const Entity *Follower() const { return follower; }
@@ -68,6 +72,10 @@ public:
 
        void Render(SDL_Surface *, const geometry::Vector<int> &offset) const;
 
+       static void CreateTypeDescription();
+       static void Construct(void *);
+       static void Load(void *);
+
 private:
        void UpdateVelocity();
 
@@ -75,7 +83,7 @@ private:
        Entity *follower;
        const graphics::Animation *animation;
        graphics::AnimationRunner runner;
-       geometry::Vector<float> spriteOffset;
+       geometry::Vector<int> spriteOffset;
        geometry::Vector<float> position;
        geometry::Vector<float> velocity;
        Orientation orientation;