X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.cpp;h=6bce2adfde82b28d092cd08a03eae7fd39246f7e;hb=0b11a24a8b08c49d6e4301573602fb6d01e7a8c8;hp=b9261a2ae8df1aa2dc985876de00baed3d483491;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index b9261a2..6bce2ad 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -1,10 +1,3 @@
-/*
- * Entity.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Entity.h"
 
 #include "../battle/Monster.h"
@@ -18,7 +11,8 @@ using battle::Monster;
 using battle::PartyLayout;
 using graphics::Animation;
 using graphics::Sprite;
-using geometry::Vector;
+using math::Fixed;
+using math::Vector;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
@@ -32,6 +26,7 @@ Entity::Entity()
 , partyLayout(0)
 , monsters(0)
 , numMonsters(0)
+, direction(ORIENTATION_NORTH)
 , orientation(ORIENTATION_NORTH)
 , speed(0)
 , flags(0) {
@@ -41,13 +36,18 @@ Entity::Entity()
 
 void Entity::SetOrientation(Orientation o) {
 	orientation = o;
-	UpdateVelocity();
 	if (CanTurn()) {
-		runner.SetColOffset(orientation);
+		runner.SetColOffset(o);
 	}
 }
 
-void Entity::SetSpeed(float s) {
+void Entity::SetDirection(Orientation o) {
+	direction = o;
+	UpdateVelocity();
+	SetOrientation(o);
+}
+
+void Entity::SetSpeed(Fixed<8> s) {
 	speed = s;
 	UpdateVelocity();
 }
@@ -105,45 +105,43 @@ void Entity::SetAnimation(const graphics::Animation *a) {
 
 
 void Entity::UpdateVelocity() {
-	if (speed == 0.0f) {
-		velocity = Vector<float>();
+	if (speed == 0) {
+		velocity = Vector<Fixed<8> >();
 		return;
 	}
-	switch (orientation) {
+	switch (direction) {
 		case ORIENTATION_NORTH:
-			velocity = Vector<float>(0.0f, -speed);
+			velocity = Vector<Fixed<8> >(0, -speed);
 			break;
 		case ORIENTATION_EAST:
-			velocity = Vector<float>(speed, 0.0f);
+			velocity = Vector<Fixed<8> >(speed, 0);
 			break;
 		case ORIENTATION_SOUTH:
-			velocity = Vector<float>(0.0f, speed);
+			velocity = Vector<Fixed<8> >(0, speed);
 			break;
 		case ORIENTATION_WEST:
-			velocity = Vector<float>(-speed, 0.0f);
+			velocity = Vector<Fixed<8> >(-speed, 0);
 			break;
 	}
 }
 
 
-bool Entity::TileLock(const geometry::Vector<int> &tileSize) const {
-	// TODO: change position to point to the top-left corner of a tile
-	Vector<int> tilePosition(position);
-	return (tilePosition.X() % tileSize.X() == 0) && (tilePosition.Y() % tileSize.Y() == 0);
+bool Entity::TileLock(const math::Vector<int> &tileSize) const {
+	Vector<int> tilePosition(ToInt(position));
+	return tilePosition % tileSize == Vector<int>();
 }
 
 
-void Entity::Update(float deltaT) {
+void Entity::Update(Uint32 deltaT) {
 	position += velocity * deltaT;
 }
 
 
 void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
-	// TODO: configurable sprite offsets
 	if (runner.Running()) {
-		runner.Draw(dest, offset + position + spriteOffset);
+		runner.Draw(dest, offset + ToInt(position) + spriteOffset);
 	} else {
-		sprite->Draw(dest, offset + position + spriteOffset, CanTurn() ? orientation : 0);
+		sprite->Draw(dest, offset + ToInt(position) + spriteOffset, CanTurn() ? orientation : 0);
 	}
 }