X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=35c0c5c76f9a09a53b38e68ac5f8228d524c8449;hb=d71217e2be1466726581146000a0f61620423e9b;hp=af156304b9412c6523e7aec39f7b0547e6fadd3f;hpb=f552d26f537af9fa48255bd71cdc1a0a1b860bac;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index af15630..35c0c5c 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -1,10 +1,3 @@
-/*
- * MapState.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "MapState.h"
 
 #include "Map.h"
@@ -303,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->capsule);
+				}
+				for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
+					battleState->AddMonster(**monster);
 				}
 
 				ColorFade *fadeIn(new ColorFade(this, 0, 500, true));
@@ -318,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)
 			}
 		}
 	}