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

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index ca1dafb..9bae990 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -299,6 +299,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;
 			}