removed useless comments

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

diff --git a/src/map/Entity.h b/src/map/Entity.h
index d1746c71a3cd73ff77dc37fb03de899796bdcf6f..13044880121569cfa54c1ef4f7ce34dbc6a64457 100644 (file)
--- a/src/map/Entity.h
+++ b/src/map/Entity.h
@@ -1,10 +1,17 @@
 #ifndef MAP_ENTITY_H_
 #define MAP_ENTITY_H_
 
-#include "../battle/fwd.h"
-#include "../battle/Monster.h"
-#include "../geometry/Vector.h"
-#include "../graphics/fwd.h"
+namespace app {
+       class Application;
+       class State;
+}
+namespace battle {
+       class Monster;
+       class PartyLayout;
+}
+
+#include "../math/Fixed.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.h"
 
 #include <functional>
@@ -38,20 +45,20 @@ public:
 
 public:
        /// Pixel resolved position of the entity's top left corner on the map.
-       geometry::Vector<float> &Position() { return position; }
-       const geometry::Vector<float> &Position() const { return position; }
+       math::Vector<math::Fixed<8> > &Position() { return position; }
+       const math::Vector<math::Fixed<8> > &Position() const { return position; }
 
        /// Velocity of the entity in pixels per second.
-       geometry::Vector<float> &Velocity() { return velocity; }
-       const geometry::Vector<float> &Velocity() const { return velocity; }
+       math::Vector<math::Fixed<8> > &Velocity() { return velocity; }
+       const math::Vector<math::Fixed<8> > &Velocity() const { return velocity; }
 
        /// Offset of the entity's sprite's to left corner relative to Position().
-       geometry::Vector<int> &SpriteOffset() { return spriteOffset; }
-       const geometry::Vector<int> &SpriteOffset() const { return spriteOffset; }
+       math::Vector<int> &SpriteOffset() { return spriteOffset; }
+       const math::Vector<int> &SpriteOffset() const { return spriteOffset; }
 
        /// Reset the entity to the stored tile coordinates (usually set when
        /// loading game data).
-       void ResetPosition(const geometry::Vector<int> &tileSize) { position = tilePosition * tileSize; }
+       void ResetPosition(const math::Vector<int> &tileSize) { position = tilePosition * tileSize; }
 
        /// Set the animation to use for animated entities.
        /// For orientable entities, the animation  should have north, south, east,
@@ -79,7 +86,7 @@ public:
        Orientation GetOrientation() const { return orientation; }
        /// Set the entity's speed in pixels per second.
        /// This speed is then combined with the orientation to form a velocity.
-       void SetSpeed(float);
+       void SetSpeed(math::Fixed<8>);
 
        /// Change to a natural, relaxed animation state (row offset 0).
        void SetHandsFree();
@@ -124,12 +131,12 @@ public:
        void RemoveFollower(Entity *);
 
        /// Check if position locks into grid defined by given tileSize.
-       bool TileLock(const geometry::Vector<int> &tileSize) const;
+       bool TileLock(const math::Vector<int> &tileSize) const;
 
        /// Integrate this entity's physical properties over given time interval.
-       void Update(float deltaT);
+       void Update(Uint32 deltaT);
 
-       void Render(SDL_Surface *, const geometry::Vector<int> &offset) const;
+       void Render(SDL_Surface *, const math::Vector<int> &offset) const;
 
        static void CreateTypeDescription();
        static void Construct(void *);
@@ -146,16 +153,16 @@ private:
        battle::Monster **monsters;
        int numMonsters;
        graphics::AnimationRunner runner;
-       geometry::Vector<int> spriteOffset;
-       geometry::Vector<int> tilePosition;
-       geometry::Vector<float> position;
-       geometry::Vector<float> velocity;
+       math::Vector<int> spriteOffset;
+       math::Vector<int> tilePosition;
+       math::Vector<math::Fixed<8> > position;
+       math::Vector<math::Fixed<8> > velocity;
        Orientation orientation;
-       float speed;
+       math::Fixed<8> speed;
        int flags;
 
 };
 
 }
 
-#endif /* MAP_ENTITY_H_ */
+#endif