mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
Enabled simple intermission for hubs
This commit is contained in:
parent
c03cb2c97a
commit
ed2b73833b
3 changed files with 7 additions and 2 deletions
|
@ -653,7 +653,7 @@ void G_ChangeLevel(const char *levelname, int position, int flags, int nextSkill
|
|||
|
||||
if (thiscluster && (thiscluster->flags & CLUSTER_HUB))
|
||||
{
|
||||
if ((level.flags & LEVEL_NOINTERMISSION) || (nextcluster == thiscluster))
|
||||
if ((level.flags & LEVEL_NOINTERMISSION) || ((nextcluster == thiscluster) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION)))
|
||||
NoWipe = 35;
|
||||
D_DrawIcon = "TELEICON";
|
||||
}
|
||||
|
@ -874,7 +874,7 @@ void G_DoCompleted (void)
|
|||
|
||||
if (!deathmatch &&
|
||||
((level.flags & LEVEL_NOINTERMISSION) ||
|
||||
((nextcluster == thiscluster) && (thiscluster->flags & CLUSTER_HUB))))
|
||||
((nextcluster == thiscluster) && (thiscluster->flags & CLUSTER_HUB) && !(thiscluster->flags & CLUSTER_ALLOWINTERMISSION))))
|
||||
{
|
||||
G_WorldDone ();
|
||||
return;
|
||||
|
|
|
@ -473,6 +473,7 @@ struct cluster_info_t
|
|||
#define CLUSTER_LOOKUPENTERTEXT 0x00000020 // Enter text is the name of a language string
|
||||
#define CLUSTER_LOOKUPNAME 0x00000040 // Name is the name of a language string
|
||||
#define CLUSTER_LOOKUPCLUSTERNAME 0x00000080 // Cluster name is the name of a language string
|
||||
#define CLUSTER_ALLOWINTERMISSION 0x00000100 // Allow intermissions between levels in a hub.
|
||||
|
||||
extern FLevelLocals level;
|
||||
|
||||
|
|
|
@ -699,6 +699,10 @@ void FMapInfoParser::ParseCluster()
|
|||
{
|
||||
clusterinfo->flags |= CLUSTER_HUB;
|
||||
}
|
||||
else if (sc.Compare("allowintermission"))
|
||||
{
|
||||
clusterinfo->flags |= CLUSTER_ALLOWINTERMISSION;
|
||||
}
|
||||
else if (sc.Compare("cdtrack"))
|
||||
{
|
||||
ParseAssign();
|
||||
|
|
Loading…
Reference in a new issue