X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=6ef2be748deb8e1dc874e3588f0b4326f561aa8a;hb=1d6a9f01b8db0f5212b6a02603dd0670c6da38c7;hp=7f602a73ebf01c0d7f5ac338e2c22c30fc7d236a;hpb=a550d5e73bef77a8bb98a31034dcaad83a43677a;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 7f602a7..6ef2be7 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -23,7 +23,8 @@ MapState::MapState(const Map *map)
 : map(map)
 , controlled(0)
 , tempTarget(20, 20)
-, camera(100, 100, &tempTarget) {
+, camera(100, 100, &tempTarget)
+, walkingSpeed(64) {
 
 }
 
@@ -51,6 +52,23 @@ void MapState::Resize(int width, int height) {
 
 void MapState::HandleEvents(const Input &input) {
 	if (!controlled) return;
+	if (!controlled->TileLock(map->Tileset()->Width(), map->Tileset()->Height())) return;
+
+	if (input.IsDown(Input::PAD_UP)) {
+		controlled->SetOrientation(Entity::ORIENTATION_NORTH);
+		controlled->SetSpeed(walkingSpeed);
+	} else if (input.IsDown(Input::PAD_RIGHT)) {
+		controlled->SetOrientation(Entity::ORIENTATION_EAST);
+		controlled->SetSpeed(walkingSpeed);
+	} else if (input.IsDown(Input::PAD_DOWN)) {
+		controlled->SetOrientation(Entity::ORIENTATION_SOUTH);
+		controlled->SetSpeed(walkingSpeed);
+	} else if (input.IsDown(Input::PAD_LEFT)) {
+		controlled->SetOrientation(Entity::ORIENTATION_WEST);
+		controlled->SetSpeed(walkingSpeed);
+	} else {
+		controlled->SetSpeed(0.0f);
+	}
 }
 
 void MapState::UpdateWorld(float deltaT) {
@@ -60,6 +78,8 @@ void MapState::UpdateWorld(float deltaT) {
 }
 
 void MapState::Render(SDL_Surface *screen) {
+	SDL_FillRect(screen, 0, SDL_MapRGB(screen->format, 0, 0, 0));
+
 	Vector<int> offset(camera.CalculateOffset());
 	map->Render(screen, offset);