X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=36b4af53752714d58d1fc356230709b2aeaec988;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=be1ef34155571d65ccdf5a6923eddf47c38a781d;hpb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index be1ef34..36b4af5 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -1,10 +1,3 @@
-/*
- * BattleState.cpp
- *
- *  Created on: Aug 5, 2012
- *      Author: holy
- */
-
 #include "BattleState.h"
 
 #include "PartyLayout.h"
@@ -113,6 +106,7 @@ void BattleState::OnEnterState(SDL_Surface *screen) {
 
 	itemMenu = *res->itemMenuProperties;
 	LoadInventory();
+	ClearAllAttacks();
 }
 
 void BattleState::LoadInventory() {
@@ -127,7 +121,6 @@ void BattleState::LoadInventory() {
 			itemMenu.AddEmptyEntry();
 		}
 	}
-	ClearAllAttacks();
 }
 
 void BattleState::OnExitState(SDL_Surface *screen) {