eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uninline mapSetEnteringLocation

This commit is contained in:
Alexander Batalov 2022-09-15 19:59:16 +03:00
parent dea8c98399
commit 9864a2551d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/map.cc
View File

@ -225,9 +225,8 @@ int isoInit()
mapMakeMapsDirectory(); mapMakeMapsDirectory();
gEnteringElevation = -1; // NOTE: Uninline.
gEnteringTile = -1; mapSetEnteringLocation(-1, -1, -1);
gEnteringRotation = -1;
return 0; return 0;
} }
@ -808,9 +807,8 @@ static int mapLoad(File* stream)
} }
if (gEnteringElevation == -1) { if (gEnteringElevation == -1) {
gEnteringElevation = gMapHeader.enteringElevation; // NOTE: Uninline.
gEnteringTile = gMapHeader.enteringTile; mapSetEnteringLocation(gMapHeader.enteringElevation, gMapHeader.enteringTile, gMapHeader.enteringRotation);
gEnteringRotation = gMapHeader.enteringRotation;
} }
_obj_remove_all(); _obj_remove_all();
@ -991,9 +989,8 @@ err:
gameMouseSetCursor(savedMouseCursorId); gameMouseSetCursor(savedMouseCursorId);
gEnteringElevation = -1; // NOTE: Uninline.
gEnteringTile = -1; mapSetEnteringLocation(-1, -1, -1);
gEnteringRotation = -1;
gameMovieFadeOut(); gameMovieFadeOut();