X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.cpp;h=568fe8857fa4e76a16a589395bae0b84cd718ce1;hb=00b557a47e47d9410730d47d436f6158a3fb79f5;hp=ab1e6fd2faadf0f64e53635bf082d542b8e6b8c7;hpb=62c0a1d0ac98eb51418e4daa59e80b6cc97b522f;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index ab1e6fd..568fe88 100644
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -44,7 +44,7 @@ void SwapHeroes::Resize(int width, int height) {
 }
 
 
-void SwapHeroes::HandleInput(const Input &input) {
+void SwapHeroes::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		if (selected != -1 && cursor != selected) {
 			battle->SwapHeroes(cursor, selected);
@@ -108,7 +108,7 @@ void SwapHeroes::MoveLeft() {
 	if (cursor > 0) {
 		--cursor;
 	} else {
-		cursor = battle->Heroes().size();
+		cursor = battle->NumHeroes();
 	}
 }
 
@@ -128,7 +128,7 @@ void SwapHeroes::RenderCursors(SDL_Surface *screen, const geometry::Vector<int>
 	Vector<int> cursorOffset(battle->Res().swapCursor->Width() / -8, battle->Res().swapCursor->Height() / 8);
 	Vector<int> indicatorOffset(0, 0);
 	vector<Point<int> > positions;
-	for (vector<Hero>::size_type i(0), end(battle->Heroes().size()); i < end; ++i) {
+	for (int i(0), end(battle->NumHeroes()); i < end; ++i) {
 		Vector<int> positionCorrection(battle->Res().swapCursor->Width() / 2, battle->HeroTagAt(i).HeroSprite()->Height() - battle->Res().swapCursor->Height() / 2);
 		// indicator offsets are inverted for heroes
 		positionCorrection -= cursorOffset;