Merge pull request #681 from InfoTeddy/general-bug-fixes-3

Remove final_colorframe assignments when entering minitowers
This commit is contained in:
Terry Cavanagh
2021-05-17 18:55:52 +10:30
committed by GitHub

View File

@@ -1491,7 +1491,6 @@ void mapclass::loadlevel(int rx, int ry)
tower.minitowermode = true; tower.minitowermode = true;
graphics.towerbg.scrolldir = 0; graphics.towerbg.scrolldir = 0;
setbgobjlerp(graphics.towerbg); setbgobjlerp(graphics.towerbg);
final_colorframe = 2;
roomname = "The Final Challenge"; roomname = "The Final Challenge";
tileset = 1; tileset = 1;
@@ -1537,7 +1536,6 @@ void mapclass::loadlevel(int rx, int ry)
tower.minitowermode = true; tower.minitowermode = true;
graphics.towerbg.scrolldir = 0; graphics.towerbg.scrolldir = 0;
setbgobjlerp(graphics.towerbg); setbgobjlerp(graphics.towerbg);
final_colorframe = 2;
roomname = "The Final Challenge"; roomname = "The Final Challenge";
tileset = 1; tileset = 1;