zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add 'sv_alwaystally' defaults to 0 with the following states:

Browse source 
* 0: previous behavior (completely MAPINFO controlled)
* 1: always show level tally at the end of an episode
* 2: always show level tally even when changing levels within a hub
This commit is contained in:
Rachael Alexanderson 2020-07-21 13:53:27 -04:00
parent fcb6e1b18c
commit 810e240f89
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/g_level.cpp
View file

@ -151,7 +151,7 @@ CUSTOM_CVAR(Int, gl_lightmode, 3, CVAR_ARCHIVE | CVAR_NOINITCALL)
}
}
CVAR(Int, sv_alwaystally, 0, CVAR_ARCHIVE | CVAR_SERVERINFO)
static FRandom pr_classchoice ("RandomPlayerClassChoice");
@ -580,6 +580,26 @@ static bool unloading;
EXTERN_CVAR(Bool, sv_singleplayerrespawn)
bool FLevelLocals::ShouldDoIntermission(cluster_info_t* nextcluster, cluster_info_t* thiscluster)
{
// this is here to remove some code duplication
if ((sv_alwaystally == 2) || (deathmatch))
return true;
if ((sv_alwaystally == 0) && (flags & LEVEL_NOINTERMISSION))
return false;
bool withinSameCluster = (nextcluster == thiscluster);
bool clusterIsHub = (thiscluster->flags & CLUSTER_HUB);
bool hubNoIntermission = !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION);
if (withinSameCluster && clusterIsHub && hubNoIntermission)
return false;
return true;
}
void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags, int nextSkill)
{
if (!isPrimaryLevel()) return; // only the primary level may exit.
@ -682,7 +702,7 @@ void FLevelLocals::ChangeLevel(const char *levelname, int position, int inflags,
if (thiscluster && (thiscluster->flags & CLUSTER_HUB))
{
if ((flags & LEVEL_NOINTERMISSION) || ((nextcluster == thiscluster) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION)))
if (!ShouldDoIntermission(nextcluster, thiscluster))
NoWipe = 35;
D_DrawIcon = "TELEICON";
}
@ -994,9 +1014,7 @@ bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
finishstate = mode;
if (!deathmatch &&
((flags & LEVEL_NOINTERMISSION) ||
((nextcluster == thiscluster) && (thiscluster->flags & CLUSTER_HUB) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION))))
if (!ShouldDoIntermission(nextcluster, thiscluster))
{
WorldDone ();
return false;

1
src/g_levellocals.h
View file

@ -150,6 +150,7 @@ struct FLevelLocals
void Init();
private:
bool ShouldDoIntermission(cluster_info_t* nextcluster, cluster_info_t* thiscluster);
line_t *FindPortalDestination(line_t *src, int tag);
void BuildPortalBlockmap();
void UpdatePortal(FLinePortal *port);