X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=7b0905d37654fc50819a2b53f9218ce878ea663b;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=5ec95071963cbfccac3f3920b3ffc0c1ca56343d;hpb=0bbc2eda56eba3ea195c2043370ff4d3fd29ca79;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 5ec9507..7b0905d 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -1,10 +1,3 @@
-/*
- * MapState.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "MapState.h"
 
 #include "Map.h"
@@ -17,6 +10,7 @@
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
 #include "../graphics/ColorFade.h"
+#include "../menu/PartyMenu.h"
 
 #include <algorithm>
 
@@ -26,6 +20,7 @@ using battle::BattleState;
 using common::GameConfig;
 using geometry::Vector;
 using graphics::ColorFade;
+using menu::PartyMenu;
 
 namespace map {
 
@@ -69,6 +64,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)) {