From 3988e270591ff7eebedc5d424f5e9ffc90fb87c8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 11 Apr 2018 19:10:15 +0200 Subject: [PATCH] - scriptified the last remaining definition (BTSX MAP12 beta) - Changes to map geometry must force a node rebuild (SetVertex, SetLineSectorRef.) - fixed incorrect use of scaling constant in SetWallYScale. --- src/compatibility.cpp | 3 +++ wadsrc/static/compatibility.txt | 18 +----------------- wadsrc/static/zscript/level_compatibility.txt | 18 +++++++++++++++++- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/compatibility.cpp b/src/compatibility.cpp index 576154dc0..d8cc2ecfa 100644 --- a/src/compatibility.cpp +++ b/src/compatibility.cpp @@ -104,6 +104,7 @@ enum // EXTERNAL DATA DECLARATIONS ---------------------------------------------- extern TArray MapThingsConverted; +extern bool ForceNodeBuild; // PUBLIC DATA DEFINITIONS ------------------------------------------------- @@ -853,6 +854,7 @@ DEFINE_ACTION_FUNCTION(DLevelCompatibility, SetVertex) { level.vertexes[vertex].p = DVector2(x, y); } + ForceNodeBuild = true; return 0; } @@ -872,6 +874,7 @@ DEFINE_ACTION_FUNCTION(DLevelCompatibility, SetLineSectorRef) side->sector = &level.sectors[sectoridx]; } } + ForceNodeBuild = true; return 0; } diff --git a/wadsrc/static/compatibility.txt b/wadsrc/static/compatibility.txt index 69de0fa9b..f5ea9710d 100644 --- a/wadsrc/static/compatibility.txt +++ b/wadsrc/static/compatibility.txt @@ -194,7 +194,7 @@ B9DFF13207EACAC675C71D82624D0007 // XtheaterIII map01 D0139194F7817BF06F3988DFC47DB38D // Whispers of Satan map29 { - nopassover + nopassover } 5397C3B7D9B33AAF526D15A81A762828 // daedalus.wad Travel tubes (they are all identical) @@ -249,19 +249,3 @@ DC96228097DD004C40CCB1DB14A91EAA // unloved.pk3:unlovedmaps.wad map05 setslopeoverflow polyobj } - - - - -712BB4CFBD0753178CA0C6814BE4C288 // map12 BTSX_E1 - patch some rendering glitches that are problematic to detect -{ - setsectortag 545 32000 - setsectortag 1618 32000 - setlinespecial 2853 Sector_Set3DFloor 32000 4 0 0 0 - setsectortag 439 32001 - setsectortag 458 32001 - setlinespecial 2182 Sector_Set3DFloor 32001 4 0 0 0 - setsectortag 454 32002 - setsectortag 910 32002 - setlinespecial 2410 Sector_Set3DFloor 32002 4 1 0 0 -} diff --git a/wadsrc/static/zscript/level_compatibility.txt b/wadsrc/static/zscript/level_compatibility.txt index acfbfda69..32f85b72c 100644 --- a/wadsrc/static/zscript/level_compatibility.txt +++ b/wadsrc/static/zscript/level_compatibility.txt @@ -572,7 +572,23 @@ class LevelCompatibility play SetLineSectorRef(329, Line.front, 74); AddSectorTag(74, 4); SetLineSpecial(357, Transfer_Heights, 4, 2); + break; } + + case '712BB4CFBD0753178CA0C6814BE4C288': // beta version of map12 BTSX_E1 - patch some rendering glitches that are problematic to detect + { + AddSectorTag(545, 32000); + AddSectorTag(1618, 32000); + SetLineSpecial(2853, Sector_Set3DFloor, 32000, 4); + AddSectorTag(439, 32001); + AddSectorTag(458, 32001); + SetLineSpecial(2182, Sector_Set3DFloor, 32001, 4); + AddSectorTag(454, 32002); + AddSectorTag(910, 32002); + SetLineSpecial(2410, Sector_Set3DFloor, 32002, 4, 1); + break; + } + } } @@ -642,6 +658,6 @@ class LevelCompatibility play private static void SetWallYScale(int line, int side, int texpart, double scale) { - level.lines[line].sidedef[side].SetTextureYScale(texpart, 1.090909); + level.lines[line].sidedef[side].SetTextureYScale(texpart, scale); } }