zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 16:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- StartTravel and EndTravel

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-29 16:11:23 +01:00
parent 14101fa447
commit 4cb3ce8196
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/g_level.cpp
View file

@ -1279,7 +1279,7 @@ void G_DoWorldDone (void)
Printf ("No next map specified.\n"); Printf ("No next map specified.\n");
nextlevel = level.MapName; nextlevel = level.MapName;
} }
G_StartTravel (); level.StartTravel ();
G_DoLoadLevel (nextlevel, startpos, true, false); G_DoLoadLevel (nextlevel, startpos, true, false);
startpos = 0; startpos = 0;
gameaction = ga_nothing; gameaction = ga_nothing;
@ -1296,7 +1296,7 @@ void G_DoWorldDone (void)
// //
//========================================================================== //==========================================================================
void G_StartTravel () void FLevelLocals::StartTravel ()
{ {
if (deathmatch) if (deathmatch)
return; return;
@ -1343,9 +1343,9 @@ void G_StartTravel ()
// //
//========================================================================== //==========================================================================
int G_FinishTravel () int FLevelLocals::FinishTravel ()
{ {
TThinkerIterator<AActor> it (NAME_PlayerPawn, STAT_TRAVELLING); auto it = GetThinkerIterator<AActor>(NAME_PlayerPawn, STAT_TRAVELLING);
AActor *pawn, *pawndup, *oldpawn, *next; AActor *pawn, *pawndup, *oldpawn, *next;
AActor *inv; AActor *inv;
FPlayerStart *start; FPlayerStart *start;
@ -1365,7 +1365,7 @@ int G_FinishTravel ()
pawndup = pawn->player->mo; pawndup = pawn->player->mo;
assert (pawn != pawndup); assert (pawn != pawndup);
start = level.PickPlayerStart(pnum, 0); start = PickPlayerStart(pnum, 0);
if (start == NULL) if (start == NULL)
{ {
if (pawndup != nullptr) if (pawndup != nullptr)
@ -1384,7 +1384,7 @@ int G_FinishTravel ()
// The player being spawned here is a short lived dummy and // The player being spawned here is a short lived dummy and
// must not start any ENTER script or big problems will happen. // must not start any ENTER script or big problems will happen.
pawndup = level.SpawnPlayer(start, pnum, SPF_TEMPPLAYER); pawndup = SpawnPlayer(start, pnum, SPF_TEMPPLAYER);
if (pawndup != NULL) if (pawndup != NULL)
{ {
if (!(changeflags & CHANGELEVEL_KEEPFACING)) if (!(changeflags & CHANGELEVEL_KEEPFACING))
@ -1736,7 +1736,7 @@ void FLevelLocals::UnSnapshotLevel (bool hubLoad)
if (hubLoad) if (hubLoad)
{ {
// Unlock ACS global strings that were locked when the snapshot was made. // Unlock ACS global strings that were locked when the snapshot was made.
Behaviors.UnlockLevelVarStrings(level.levelnum); Behaviors.UnlockLevelVarStrings(levelnum);
} }
} }

3
src/g_level.h
View file

@ -472,9 +472,6 @@ enum
void G_ChangeLevel(const char *levelname, int position, int flags, int nextSkill=-1); void G_ChangeLevel(const char *levelname, int position, int flags, int nextSkill=-1);
void G_StartTravel ();
int G_FinishTravel ();
void G_DoLoadLevel (const FString &MapName, int position, bool autosave, bool newGame); void G_DoLoadLevel (const FString &MapName, int position, bool autosave, bool newGame);
cluster_info_t *FindClusterInfo (int cluster); cluster_info_t *FindClusterInfo (int cluster);

2
src/g_levellocals.h
View file

@ -220,6 +220,8 @@ public:
void DeathMatchSpawnPlayer (int playernum); void DeathMatchSpawnPlayer (int playernum);
FPlayerStart *PickPlayerStart(int playernum, int flags = 0); FPlayerStart *PickPlayerStart(int playernum, int flags = 0);
bool DoCompleted(FString nextlevel, wbstartstruct_t &wminfo); bool DoCompleted(FString nextlevel, wbstartstruct_t &wminfo);
void StartTravel();
int FinishTravel();
private: private: