From 54d9ec11a804b70009a68cecb888cf4e3b589ba6 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 15 Oct 2018 09:07:59 +0200 Subject: [PATCH 1/3] Changed AppVeyor configuration to create the 64 bit debug build with VS 2017 and no XP toolset --- .appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c309060076..179e1724ae 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,11 +24,11 @@ environment: CONFIGURATION: Release TOOLSET: v141 APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" - - GENERATOR: "Visual Studio 14 2015 Win64" + - GENERATOR: "Visual Studio 15 2017 Win64" CONFIGURATION: Debug - TOOLSET: v140_xp - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - + TOOLSET: v141 + APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + build_script: - md build - cd build From 1e6454598cd8e5d698735543497ffa3c25f6547f Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Tue, 16 Oct 2018 13:02:14 +0200 Subject: [PATCH 2/3] Preserve line locknumber in savegames. --- src/p_saveg.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index fcb075e0f7..6248dab3e1 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -73,6 +73,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, line_t &line, line_t * ("alpha", line.alpha, def->alpha) .Args("args", line.args, def->args, line.special) ("portalindex", line.portalindex, def->portalindex) + ("locknumber", line.locknumber, def->locknumber) // Unless the map loader is changed the sidedef references will not change between map loads so there's no need to save them. //.Array("sides", line.sidedef, 2) .EndObject(); From c0cf19e9b580391c6dc15b9e1df513885c195dd4 Mon Sep 17 00:00:00 2001 From: Erick Tenorio Date: Tue, 16 Oct 2018 02:37:39 -0500 Subject: [PATCH 3/3] - Visually align Doom 2 MAP04 crusher floors Use Transfer_Heights to fake floors on the crusher sectors --- wadsrc/static/zscript/level_compatibility.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wadsrc/static/zscript/level_compatibility.txt b/wadsrc/static/zscript/level_compatibility.txt index a78d1fc136..e007e98dd7 100644 --- a/wadsrc/static/zscript/level_compatibility.txt +++ b/wadsrc/static/zscript/level_compatibility.txt @@ -514,6 +514,8 @@ class LevelCompatibility play ClearSectorTags(34); ClearSectorTags(83); ClearSectorTags(85); + // Visually align floors between crushers + SetLineSpecial(3, Transfer_Heights, 14, 6); break; }