X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=5ba60d67bb02ac29061df9509834b307145c40ba;hb=520af5a8ef4fdfd4156377d4fccd93eecd450f0f;hp=f548f2dfdc6968a59c4ce8a8dbd09ec50f24d1e0;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index f548f2d..5ba60d6 100644 --- a/src/battle/BattleState.cpp +++ b/src/battle/BattleState.cpp @@ -138,12 +138,10 @@ void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) { return; } if (Victory()) { - // TODO: push victory state ctrl.PopState(); return; } if (Defeat()) { - // TODO: push defeat state ctrl.PopState(); return; } @@ -227,7 +225,6 @@ void BattleState::CalculateDamage() { if (ac.GetType() == AttackChoice::DEFEND) return; TargetSelection &ts(ac.Selection()); - // TODO: this only evaluates SWORD type attacks if (CurrentAttack().isMonster) { const Stats &attackerStats(MonsterAt(CurrentAttack().index).GetStats()); CalculateDamage(attackerStats, ts); @@ -241,7 +238,6 @@ void BattleState::DecideMonsterAttack(Monster &m) const { AttackChoice &ac(m.GetAttackChoice()); TargetSelection &ts(ac.Selection()); ac.Reset(); - // TODO: run monster's attack script int target(rand() % NumHeroes()); while (!HeroPositionOccupied(target)) { target = rand() % NumHeroes(); @@ -302,7 +298,6 @@ void BattleState::CalculateDamage(const Stats &attackerStats, TargetSelection &t } Uint16 BattleState::CalculateDamage(const Stats &attacker, const Stats &defender) const { - // TODO: find out real formula and add some randomness return attacker.Attack() / 2 - defender.Defense() / 4; }