X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=121dfbcdc0e41d0478d37500f906f4235902d6f2;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=35c0c5c76f9a09a53b38e68ac5f8228d524c8449;hpb=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;p=l2e.git diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp index 35c0c5c..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; @@ -297,7 +297,7 @@ bool MapState::CheckMonster() { } } if (game->state->capsule) { - battleState->SetCapsule(game->state->capsule); + battleState->SetCapsule(&game->state->GetCapsule()); } for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) { battleState->AddMonster(**monster);