X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=6ea4675efcbbe1c381d4c70148ddec5414a630e0;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=65cd8ccdc70173c2ab0e9106588ca249a6fb705f;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 65cd8cc..6ea4675 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -24,15 +24,15 @@ using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::EnterState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnEnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 }
 
-void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
+void SelectSpell::OnExitState(Application &c, SDL_Surface *screen) {
 	ctrl = 0;
 }
 
-void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
 		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
 		battle->ActiveHero().GetAttackChoice().SetSpell(battle->ActiveHero().SpellMenu().Selected());
@@ -40,12 +40,12 @@ void SelectSpell::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	}
 }
 
-void SelectSpell::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(int width, int height) {
 
 }
 
@@ -63,7 +63,6 @@ void SelectSpell::HandleEvents(const Input &input) {
 			}
 			if (spell->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
 				ac.SetSpell(spell);
 				battle->NextHero();
 				ctrl->PopState();
@@ -108,7 +107,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
 
 void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 	const Frame *frame(battle->Res().selectFrame);
-	Vector<int> position(frame->BorderWidth(), frame->BorderHeight());
+	Vector<int> position(frame->BorderSize());
 	int width(battle->Width() - 2 * frame->BorderWidth());
 	int height(battle->Res().normalFont->CharHeight() * 13);
 	frame->Draw(screen, position + offset, width, height);