X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=af156304b9412c6523e7aec39f7b0547e6fadd3f;hb=350055a7ff27c74882aff8a4d6af2014782f830b;hp=7e42e13a1779ef5041d64fbf57ecf4ef410fbda8;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 7e42e13..af15630 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -17,6 +17,7 @@
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
 #include "../graphics/ColorFade.h"
+#include "../menu/PartyMenu.h"
 
 #include <algorithm>
 
@@ -26,12 +27,12 @@ using battle::BattleState;
 using common::GameConfig;
 using geometry::Vector;
 using graphics::ColorFade;
+using menu::PartyMenu;
 
 namespace map {
 
 MapState::MapState(GameConfig *g, Map *map)
 : game(g)
-, ctrl(0)
 , map(map)
 , controlled(0)
 , pushed(0)
@@ -47,21 +48,20 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void MapState::OnEnterState(SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 	LoadMap(map);
 }
 
-void MapState::OnExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void MapState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(SDL_Surface *screen) {
 	camera.Resize(screen->w, screen->h);
 }
 
-void MapState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -71,6 +71,11 @@ void MapState::OnResize(int width, int height) {
 
 
 void MapState::HandleEvents(const Input &input) {
+	if (input.JustPressed(Input::ACTION_X)) {
+		Ctrl().PushState(new PartyMenu(game));
+		return;
+	}
+
 	if (!controlled) return;
 
 	if (input.IsDown(Input::PAD_UP)) {
@@ -307,9 +312,9 @@ bool MapState::CheckMonster() {
 				ColorFade *fadeOut(new ColorFade(this, 0, 500));
 				fadeOut->SetLeadOutTime(500);
 
-				ctrl->PushState(fadeIn);
-				ctrl->PushState(battleState);
-				ctrl->PushState(fadeOut);
+				Ctrl().PushState(fadeIn);
+				Ctrl().PushState(battleState);
+				Ctrl().PushState(fadeOut);
 				// TODO: move entity erase to happen after the transition or battle
 				entities.erase(e);
 				return true;
@@ -443,13 +448,13 @@ bool MapState::ZCompare(const Entity *lhs, const Entity *rhs) {
 
 
 void MapState::HandleSyscall(common::ScriptRunner &r) {
-	switch (r.Integer0()) {
+	switch (r.IntegerRegister(0)) {
 		case TRANSITION: {
-			ctrl->PushState(new ColorFade(this, 0, 500, true));
-			ctrl->PushState(new TransitionState(this, reinterpret_cast<Map *>(r.Address0()), r.Vector0()));
+			Ctrl().PushState(new ColorFade(this, 0, 500, true));
+			Ctrl().PushState(new TransitionState(this, reinterpret_cast<Map *>(r.AddressRegister(0)), r.VectorRegister(0)));
 			ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
 			fadeOut->SetLeadOutTime(500);
-			ctrl->PushState(fadeOut);
+			Ctrl().PushState(fadeOut);
 			break;
 		}
 	}