X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.h;h=24b7c94d5c6fbf6bc4365625d15953bf6fcfff26;hb=5f9a1893c0db8f53889a390e4c4b95d57abd4384;hp=0f3216e4618b51fe3a0f822086dd2ca2eb013ced;hpb=087783315ac5955c17bb3b051c9351f321653df6;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 0f3216e..24b7c94 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -45,7 +45,8 @@ public: , battle(game->heroesLayout, monstersLayout) , attackTypeMenu(res->attackIcons) , moveMenu(res->moveIcons) - , ranAway(false) { assert(background && game); } + , ranAway(false), alreadyPushed(false) + { assert(background && game); } public: void AddMonster(const Monster &); @@ -60,6 +61,7 @@ public: public: Battle &GetBattle() { return battle; } const Battle &GetBattle() const { return battle; } + const common::GameConfig &Game() const { return *game; } const Resources &Res() const { return *res; } AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; } MoveMenu &GetMoveMenu() { return moveMenu; } @@ -122,6 +124,7 @@ private: math::Vector offset; bool ranAway; + bool alreadyPushed; };