X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=b18d75da38f685c877618de0796d0dcc3a15ea62;hb=5cca794c5b6549b7750c88b5c2217d659fa963dd;hp=ca1dafb0542691556627858c482d755de24005ee;hpb=d7d5ff97b2e4136141f5603d0ec9cef1d4467749;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index ca1dafb..b18d75d 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -32,7 +32,7 @@ MapState::MapState(GameConfig *g, Map *map)
 , pushed(0)
 , lastLock(-1, -1)
 , camera(100, 100, 0)
-, walkingSpeed(64)
+, walkingSpeed(1)
 , nextDirection(-1)
 , afterLock(false)
 , skipLock(false)
@@ -43,7 +43,8 @@ MapState::MapState(GameConfig *g, Map *map)
 
 
 void MapState::OnEnterState(SDL_Surface *screen) {
-	camera.Resize(screen->w, screen->h);
+	OnResize(screen->w, screen->h);
+	tileAnimation = GraphicsTimers().StartInterval(512);
 	LoadMap(map);
 }
 
@@ -52,7 +53,7 @@ void MapState::OnExitState(SDL_Surface *screen) {
 }
 
 void MapState::OnResumeState(SDL_Surface *screen) {
-	camera.Resize(screen->w, screen->h);
+	OnResize(screen->w, screen->h);
 }
 
 void MapState::OnPauseState(SDL_Surface *screen) {
@@ -64,6 +65,12 @@ void MapState::OnResize(int width, int height) {
 }
 
 
+void MapState::SetWalkingSpeed(int s) {
+	walkingSpeed = math::Fixed<8>(1, s);
+	Timestep(s);
+}
+
+
 void MapState::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_X)) {
 		Ctrl().PushState(new PartyMenu(game));
@@ -101,6 +108,7 @@ void MapState::UpdateWorld(Uint32 deltaT) {
 }
 
 void MapState::OnTileLock() {
+	// moveTimer is running when the pc is walking against a wall
 	if (moveTimer.Running() && !moveTimer.JustHit()) return;
 
 	Vector<int> nowLock(ToInt(controlled->Position()));
@@ -299,6 +307,7 @@ bool MapState::CheckMonster() {
 		for (std::vector<Entity *>::iterator e(entities.begin()), end(entities.end()); e != end; ++e) {
 			if ((*e)->Hostile() && map->TileCoordinates(ToInt((*e)->Position())) == neighbor[i]) {
 				// TODO: move entity erase to happen after the transition or battle
+				LoadBattle(*controlled, **e);
 				entities.erase(e);
 				return true;
 			}
@@ -462,7 +471,7 @@ 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);
+	map->Render(screen, offset, tileAnimation.Iteration());
 
 	if (debug) {
 		map->RenderDebug(screen, offset);