X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=7e42e13a1779ef5041d64fbf57ecf4ef410fbda8;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=6b025319b42747e00accb8ef41badb87018e0df3;hpb=2ad47aa3758fe5d04ba1764f275a0fe30706d200;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 6b02531..7e42e13 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -47,25 +47,25 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::EnterState(Application &c, SDL_Surface *screen) {
+void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
 
-void MapState::ExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void MapState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 }
 
-void MapState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
 	camera.Resize(width, height);
 }
 
@@ -412,6 +412,7 @@ void MapState::LoadMap(Map *m) {
 	map = m;
 	for (Entity *e(m->EntitiesBegin()), *end(m->EntitiesEnd()); e != end; ++e) {
 		entities.push_back(e);
+		e->ResetPosition(map->Tileset()->Size());
 	}
 	for (Entity *e(controlled); e; e = e->Follower()) {
 		entities.push_back(e);