]> git.localhorst.tv Git - l2e.git/blobdiff - src/battle/BattleState.cpp
closed the gap between battle and map state (yay)
[l2e.git] / src / battle / BattleState.cpp
index d309502301f98213036ff0ca11a6b6e9fd799f54..dcd824e32243e3a51504ca1a9b286ad49dda4094 100644 (file)
@@ -12,6 +12,7 @@
 #include "states/PerformAttacks.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
+#include "../common/GameState.h"
 #include "../common/Ikari.h"
 #include "../common/Inventory.h"
 #include "../common/Item.h"
@@ -115,7 +116,7 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::LoadInventory() {
-       const Inventory &inv(*res->inventory);
+       const Inventory &inv(game->state->inventory);
        itemMenu.Clear();
        itemMenu.Reserve(inv.MaxItems());
        for (int i(0); i < inv.MaxItems(); ++i) {