diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 20aaaeb3..30339ba2 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -1979,6 +1979,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; } obj.entities[i].ay = -6; obj.entities[i].ax = 6; @@ -3322,6 +3324,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3435,6 +3439,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3532,6 +3538,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3629,6 +3637,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3731,6 +3741,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3833,6 +3845,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -3933,6 +3947,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -4030,6 +4046,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } @@ -4127,6 +4145,8 @@ void Game::updatestate() { obj.entities[i].xp = obj.entities[j].xp+44; obj.entities[i].yp = obj.entities[j].yp+44; + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; obj.entities[j].tile = 2; obj.entities[j].colour = 101; } diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index f02e5813..cc5a1bfd 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -3427,6 +3427,8 @@ void scriptclass::teleport() obj.entities[i].xp = 150; obj.entities[i].yp = 110; if(game.teleport_to_x==17 && game.teleport_to_y==17) obj.entities[i].xp = 88; //prevent falling! + obj.entities[i].oldxp = obj.entities[i].xp; + obj.entities[i].oldyp = obj.entities[i].yp; } if (game.teleportscript == "levelonecomplete")