X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=121dfbcdc0e41d0478d37500f906f4235902d6f2;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=7b0905d37654fc50819a2b53f9218ce878ea663b;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 7b0905d..121dfbc 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -18,7 +18,7 @@ using app::Application;
 using app::Input;
 using battle::BattleState;
 using common::GameConfig;
-using geometry::Vector;
+using math::Vector;
 using graphics::ColorFade;
 using menu::PartyMenu;
 
@@ -296,8 +296,11 @@ bool MapState::CheckMonster() {
 						battleState->AddHero(*game->state->party[i]);
 					}
 				}
-				for (battle::Monster *monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
-					battleState->AddMonster(*monster);
+				if (game->state->capsule) {
+					battleState->SetCapsule(&game->state->GetCapsule());
+				}
+				for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
+					battleState->AddMonster(**monster);
 				}
 
 				ColorFade *fadeIn(new ColorFade(this, 0, 500, true));
@@ -311,9 +314,6 @@ bool MapState::CheckMonster() {
 				// TODO: move entity erase to happen after the transition or battle
 				entities.erase(e);
 				return true;
-				// needed information here:
-				//  - battle background (from tile/area/map)
-				//  - monsters + layout (from entity)
 			}
 		}
 	}