From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 29 Jan 2013 17:50:04 +0000 (+0100)
Subject: re-enable battle launching from MapState
X-Git-Url: http://git.localhorst.tv/?p=l2e.git;a=commitdiff_plain;h=0911d263c10cca314305799d5b839ee9653cac0b

re-enable battle launching from MapState

sorry, my bad
---

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;
 			}