X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=c294e1a28feda13da5b9f81be3b9e15aa4aecdc3;hb=69123d71dacfdd6592c00ead8b92b6441d0f0228;hp=6db8efabb2c09b57184e941e524b381eeef79e0d;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index 6db8efa..c294e1a 100644 --- a/src/battle/BattleState.cpp +++ b/src/battle/BattleState.cpp @@ -187,7 +187,11 @@ void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) { } void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) { - // TODO: check for victory, defeat or run + // TODO: check for victory or defeat + if (ranAway) { + ctrl.PopState(); // quit the battle scene + return; + } // reset attack choices activeHero = -1; for (vector::size_type i(0), end(heroes.size()); i < end; ++i) { @@ -237,7 +241,7 @@ void BattleState::RenderMonsters(SDL_Surface *screen, const Vector &offset) void BattleState::RenderHeroes(SDL_Surface *screen, const Vector &offset) { for (vector::size_type i(0), end(heroes.size()); i < end; ++i) { - heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset); + heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 0, 1); } }