X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=bd09da664e204891b6a8b3aeeaf86b05e3b174db;hb=9718062e6ed305d9f8f1674ff172079688e78088;hp=045f3cc6f09e6fc7561b0efa5c8cc7d613cd7284;hpb=2147d00bbcb43f5cb4499091f646057cb6944cb3;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 045f3cc..bd09da6 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -37,7 +37,7 @@ void SelectItem::ExitState(Application &c, SDL_Surface *screen) {
 void SelectItem::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::ITEM);
-		battle->ActiveHero().GetAttackChoice().SetItem(battle->GetItemMenu().Selected());
+		battle->ActiveHero().GetAttackChoice().SetItem(battle->ItemMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -54,9 +54,9 @@ void SelectItem::Resize(int width, int height) {
 
 void SelectItem::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		if (battle->GetItemMenu().SelectedIsEnabled()) {
+		if (battle->ItemMenu().SelectedIsEnabled()) {
 			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
-			const Item *item(battle->GetItemMenu().Selected());
+			const Item *item(battle->ItemMenu().Selected());
 			ac.Selection().Reset();
 			if (item->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
@@ -83,16 +83,16 @@ void SelectItem::HandleEvents(const Input &input) {
 		ctrl->PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		battle->GetItemMenu().PreviousRow();
+		battle->ItemMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		battle->GetItemMenu().NextItem();
+		battle->ItemMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		battle->GetItemMenu().NextRow();
+		battle->ItemMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		battle->GetItemMenu().PreviousItem();
+		battle->ItemMenu().PreviousItem();
 	}
 }
 
@@ -129,7 +129,7 @@ void SelectItem::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
 	Point<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
-	battle->GetItemMenu().Draw(screen, position + offset);
+	battle->ItemMenu().Draw(screen, position + offset);
 }
 
 }