mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 06:42:12 +00:00
Merge branch 'maint'
This commit is contained in:
commit
f0feee3b4e
2 changed files with 53 additions and 28 deletions
|
@ -80,6 +80,7 @@ enum
|
|||
CP_SETACTIVATION,
|
||||
CP_SECTORFLOOROFFSET,
|
||||
CP_SETWALLYSCALE,
|
||||
CP_SETTHINGZ,
|
||||
};
|
||||
|
||||
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
||||
|
@ -89,6 +90,7 @@ enum
|
|||
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
||||
|
||||
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
||||
extern TArray<FMapThing> MapThingsConverted;
|
||||
|
||||
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
||||
|
||||
|
@ -294,6 +296,15 @@ void ParseCompatibility()
|
|||
sc.MustGetFloat();
|
||||
CompatParams.Push(FLOAT2FIXED(sc.Float));
|
||||
}
|
||||
else if (sc.Compare("setthingz"))
|
||||
{
|
||||
if (flags.ExtCommandIndex == ~0u) flags.ExtCommandIndex = CompatParams.Size();
|
||||
CompatParams.Push(CP_SETTHINGZ);
|
||||
sc.MustGetNumber();
|
||||
CompatParams.Push(sc.Number);
|
||||
sc.MustGetFloat();
|
||||
CompatParams.Push(FLOAT2FIXED(sc.Float));
|
||||
}
|
||||
else
|
||||
{
|
||||
sc.UnGet();
|
||||
|
@ -497,6 +508,16 @@ void SetCompatibilityParams()
|
|||
i += 5;
|
||||
break;
|
||||
}
|
||||
case CP_SETTHINGZ:
|
||||
{
|
||||
// When this is called, the things haven't been spawned yet so we can alter the position inside the MapThings array.
|
||||
if ((unsigned)CompatParams[i+1] < MapThingsConverted.Size())
|
||||
{
|
||||
MapThingsConverted[CompatParams[i+1]].z = CompatParams[i+2];
|
||||
}
|
||||
i += 3;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,31 @@
|
|||
6DC9F6CCEAE7A91AEC48EBE506F22BC4 // void.wad MAP01
|
||||
{
|
||||
// Slightly squash the pillars in the starting room with "stimpacks"
|
||||
// floating on them so that they can be obtained.
|
||||
sectorflooroffset 62 -8
|
||||
setwallyscale 286 front bot 1.090909
|
||||
setwallyscale 287 front bot 1.090909
|
||||
setwallyscale 288 front bot 1.090909
|
||||
setwallyscale 289 front bot 1.090909
|
||||
|
||||
sectorflooroffset 63 -8
|
||||
setwallyscale 290 front bot 1.090909
|
||||
setwallyscale 291 front bot 1.090909
|
||||
setwallyscale 292 front bot 1.090909
|
||||
setwallyscale 293 front bot 1.090909
|
||||
|
||||
sectorflooroffset 118 -8
|
||||
setwallyscale 710 front bot 1.090909
|
||||
setwallyscale 711 front bot 1.090909
|
||||
setwallyscale 712 front bot 1.090909
|
||||
setwallyscale 713 front bot 1.090909
|
||||
|
||||
sectorflooroffset 119 -8
|
||||
setwallyscale 714 front bot 1.090909
|
||||
setwallyscale 715 front bot 1.090909
|
||||
setwallyscale 716 front bot 1.090909
|
||||
setwallyscale 717 front bot 1.090909
|
||||
|
||||
setslopeoverflow
|
||||
}
|
||||
|
||||
|
@ -306,34 +332,6 @@ F481922F4881F74760F3C0437FD5EDD0 // map03
|
|||
setactivation 455 16 // SPAC_Push
|
||||
}
|
||||
|
||||
6DC9F6CCEAE7A91AEC48EBE506F22BC4 // Void
|
||||
{
|
||||
// Slightly squash the pillars in the starting room with "stimpacks"
|
||||
// floating on them so that they can be obtained.
|
||||
sectorflooroffset 62 -8
|
||||
setwallyscale 286 front bot 1.090909
|
||||
setwallyscale 287 front bot 1.090909
|
||||
setwallyscale 288 front bot 1.090909
|
||||
setwallyscale 289 front bot 1.090909
|
||||
|
||||
sectorflooroffset 63 -8
|
||||
setwallyscale 290 front bot 1.090909
|
||||
setwallyscale 291 front bot 1.090909
|
||||
setwallyscale 292 front bot 1.090909
|
||||
setwallyscale 293 front bot 1.090909
|
||||
|
||||
sectorflooroffset 118 -8
|
||||
setwallyscale 710 front bot 1.090909
|
||||
setwallyscale 711 front bot 1.090909
|
||||
setwallyscale 712 front bot 1.090909
|
||||
setwallyscale 713 front bot 1.090909
|
||||
|
||||
sectorflooroffset 119 -8
|
||||
setwallyscale 714 front bot 1.090909
|
||||
setwallyscale 715 front bot 1.090909
|
||||
setwallyscale 716 front bot 1.090909
|
||||
setwallyscale 717 front bot 1.090909
|
||||
}
|
||||
|
||||
65A1EB4C87386F290816660A52932FF1 // Master Levels, garrison.wad
|
||||
{
|
||||
|
@ -349,3 +347,9 @@ F481922F4881F74760F3C0437FD5EDD0 // map03
|
|||
setlinespecial 397 NoiseAlert 0 0 0 0 0
|
||||
setlinespecial 411 NoiseAlert 0 0 0 0 0
|
||||
}
|
||||
|
||||
952CC8D03572E17BA550B01B366EFBB9 // Cheogsh map01
|
||||
{
|
||||
// make the blue key spawn above the 3D floor
|
||||
setthingz 918 296
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue