From 4622ab865b812b363eb07c57b622a2769e5ae85f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 25 Jun 2013 11:55:49 +0200 Subject: [PATCH 1/3] - merged the two blocks for void.wad in compatibility.txt. --- wadsrc/static/compatibility.txt | 54 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 1a115fbe8..209ae2aa2 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -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 { From 72e91786e2334f6683b9a6669f1790aeeff1b6ce Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 25 Jun 2013 23:36:24 +0200 Subject: [PATCH 2/3] - added SetThingZ compatibility option for fixing problems resulting from the changes to spawn position handling. --- src/compatibility.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/compatibility.cpp b/src/compatibility.cpp index 839d60dc5..cbbe12f73 100644 --- a/src/compatibility.cpp +++ b/src/compatibility.cpp @@ -80,6 +80,7 @@ enum CP_SETACTIVATION, CP_SECTORFLOOROFFSET, CP_SETWALLYSCALE, + CP_SETTHINGZ, }; // EXTERNAL FUNCTION PROTOTYPES -------------------------------------------- @@ -294,6 +295,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 +507,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 (CompatParams[i+1] < MapThingsConverted.Size()) + { + MapThingsConverted[CompatParams[i+1]].z = CompatParams[i+2]; + } + i += 3; + break; + } } } } From fb1734ba502773adf11994ed48534afd407912e8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 26 Jun 2013 00:50:50 +0200 Subject: [PATCH 3/3] - fix previous commit and add compat option for Cheogh's blue key. --- src/compatibility.cpp | 3 ++- wadsrc/static/compatibility.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/compatibility.cpp b/src/compatibility.cpp index cbbe12f73..4a4f19d6b 100644 --- a/src/compatibility.cpp +++ b/src/compatibility.cpp @@ -90,6 +90,7 @@ enum // PRIVATE FUNCTION PROTOTYPES --------------------------------------------- // EXTERNAL DATA DECLARATIONS ---------------------------------------------- +extern TArray MapThingsConverted; // PUBLIC DATA DEFINITIONS ------------------------------------------------- @@ -510,7 +511,7 @@ void SetCompatibilityParams() 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 (CompatParams[i+1] < MapThingsConverted.Size()) + if ((unsigned)CompatParams[i+1] < MapThingsConverted.Size()) { MapThingsConverted[CompatParams[i+1]].z = CompatParams[i+2]; } diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 209ae2aa2..a84ba218b 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -347,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 +}