1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00

Directly do returntolab code instead of relying on a script

Having to rely on a script means the fade out wouldn't be self-contained
in MAPMODE, which could cause a small issue where you could die during
the return to the lab. But that issue is now fixed. There's no need to
use the script, and anyway the endcutscene() and untilbars() in said
script don't do anything because there are no cutscene bars in the first
place, so no need to worry about those.
This commit is contained in:
Misa 2020-05-07 15:36:38 -07:00 committed by Ethan Lee
parent fc2f269548
commit b83cab8577

View file

@ -7361,6 +7361,25 @@ void Game::returntolab()
{ {
gamestate = GAMEMODE; gamestate = GAMEMODE;
graphics.fademode = 4; graphics.fademode = 4;
startscript = true; map.gotoroom(119, 107);
newscript="returntolab"; int player = obj.getplayer();
if (player > -1)
{
obj.entities[player].xp = 132;
obj.entities[player].yp = 137;
}
gravitycontrol = 0;
savepoint = 0;
saverx = 119;
savery = 107;
savex = 132;
savey = 137;
savegc = 0;
if (player > -1)
{
savedir = obj.entities[player].dir;
}
music.play(11);
} }