X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=4fd9a15165696399e2100190c51b77b7c1ff44b3;hb=0f5f8a6eaa938f88fd3d1e92dec2462b30840e21;hp=654e147d8ed60a677be4107f314dbc41783413aa;hpb=9718062e6ed305d9f8f1674ff172079688e78088;p=l2e.git diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h index 654e147..4fd9a15 100644 --- a/src/battle/BattleState.h +++ b/src/battle/BattleState.h @@ -78,7 +78,6 @@ public: virtual void UpdateWorld(float deltaT); virtual void Render(SDL_Surface *); - // TODO: turn this mess into a well stuctured interface public: const Resources &Res() const { return *res; } AttackTypeMenu &GetAttackTypeMenu() { return attackTypeMenu; } @@ -151,6 +150,7 @@ public: private: void LoadInventory(); + void DecideMonsterAttack(Monster &); Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const; private: @@ -160,7 +160,6 @@ private: const Resources *res; AttackTypeMenu attackTypeMenu; MoveMenu moveMenu; - // TODO: combine all data about heros or monsters std::vector monsters; std::vector attackOrder; Hero heroes[4];