lousy implementation of "array of identifiers" type

[l2e.git] / src / map / MapState.cpp

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 6b025319b42747e00accb8ef41badb87018e0df3..d678dab965d573c7722a963a9cc5936ac57af5c6 100644 (file)
--- 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,12 +20,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,30 +41,34 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::EnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+void MapState::OnEnterState(SDL_Surface *screen) {
        camera.Resize(screen->w, screen->h);
        LoadMap(map);
 }
 
-void MapState::ExitState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void MapState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnResumeState(SDL_Surface *screen) {
        camera.Resize(screen->w, screen->h);
 }
 
-void MapState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void MapState::OnPauseState(SDL_Surface *screen) {
 
 }
 
-void MapState::Resize(int width, int height) {
+void MapState::OnResize(int width, int height) {
        camera.Resize(width, 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)) {
@@ -298,8 +296,8 @@ bool MapState::CheckMonster() {
                                                battleState->AddHero(*game->state->party[i]);
                                        }
                                }
-                               for (battle::Monster *monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
-                                       battleState->AddMonster(*monster);
+                               for (battle::Monster **monster((*e)->MonstersBegin()); monster != (*e)->MonstersEnd(); ++monster) {
+                                       battleState->AddMonster(**monster);
                                }
 
                                ColorFade *fadeIn(new ColorFade(this, 0, 500, true));
@@ -307,9 +305,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;
@@ -412,6 +410,7 @@ void MapState::LoadMap(Map *m) {
        map = m;
        for (Entity *e(m->EntitiesBegin()), *end(m->EntitiesEnd()); e != end; ++e) {
                entities.push_back(e);
+               e->ResetPosition(map->Tileset()->Size());
        }
        for (Entity *e(controlled); e; e = e->Follower()) {
                entities.push_back(e);
@@ -442,13 +441,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;
                }
        }