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

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index 93530f1..6bce2ad 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -26,6 +26,7 @@ Entity::Entity()
 , partyLayout(0)
 , monsters(0)
 , numMonsters(0)
+, direction(ORIENTATION_NORTH)
 , orientation(ORIENTATION_NORTH)
 , speed(0)
 , flags(0) {
@@ -35,12 +36,17 @@ Entity::Entity()
 
 void Entity::SetOrientation(Orientation o) {
 	orientation = o;
-	UpdateVelocity();
 	if (CanTurn()) {
-		runner.SetColOffset(orientation);
+		runner.SetColOffset(o);
 	}
 }
 
+void Entity::SetDirection(Orientation o) {
+	direction = o;
+	UpdateVelocity();
+	SetOrientation(o);
+}
+
 void Entity::SetSpeed(Fixed<8> s) {
 	speed = s;
 	UpdateVelocity();
@@ -103,7 +109,7 @@ void Entity::UpdateVelocity() {
 		velocity = Vector<Fixed<8> >();
 		return;
 	}
-	switch (orientation) {
+	switch (direction) {
 		case ORIENTATION_NORTH:
 			velocity = Vector<Fixed<8> >(0, -speed);
 			break;
@@ -121,9 +127,8 @@ void Entity::UpdateVelocity() {
 
 
 bool Entity::TileLock(const math::Vector<int> &tileSize) const {
-	// TODO: change position to point to the top-left corner of a tile
 	Vector<int> tilePosition(ToInt(position));
-	return (tilePosition.X() % tileSize.X() == 0) && (tilePosition.Y() % tileSize.Y() == 0);
+	return tilePosition % tileSize == Vector<int>();
 }
 
 
@@ -133,7 +138,6 @@ void Entity::Update(Uint32 deltaT) {
 
 
 void Entity::Render(SDL_Surface *dest, const Vector<int> &offset) const {
-	// TODO: configurable sprite offsets
 	if (runner.Running()) {
 		runner.Draw(dest, offset + ToInt(position) + spriteOffset);
 	} else {