X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.cpp;h=5ec95071963cbfccac3f3920b3ffc0c1ca56343d;hb=816bc61d7e14ffcb3846eadd41bd86de9174e36f;hp=8e70acd19dbbccf0adf08601790a693162962db9;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git

diff --git a/src/map/MapState.cpp b/src/map/MapState.cpp
index 8e70acd..5ec9507 100644
--- a/src/map/MapState.cpp
+++ b/src/map/MapState.cpp
@@ -46,20 +46,20 @@ MapState::MapState(GameConfig *g, Map *map)
 }
 
 
-void MapState::OnEnterState(Application &c, SDL_Surface *screen) {
+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) {
 
 }
 
@@ -441,10 +441,10 @@ 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 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);