X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmap%2FMapState.cpp;h=b223f4fd6a2d4a111bb0394a39ccd10d612fa561;hb=ef2496b3cb7ce66b7f831278be66261834b732e5;hp=d678dab965d573c7722a963a9cc5936ac57af5c6;hpb=a67f7e662c85b2b8d46f26a3c6e018b2df6eb318;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index d678dab..b223f4f 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -296,6 +296,9 @@ bool MapState::CheckMonster() {
 						battleState->AddHero(*game->state->party[i]);
 					}
 				}
+				if (game->state->capsule) {
+					battleState->SetCapsule(&game->state->GetCapsule());
+				}
 				for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
 					battleState->AddMonster(**monster);
 				}
@@ -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)
 			}
 		}
 	}