diff --git a/.appveyor.yml b/.appveyor.yml index c30906007..179e1724a 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 diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index fcb075e0f..6248dab3e 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(); diff --git a/wadsrc/static/zscript/level_compatibility.txt b/wadsrc/static/zscript/level_compatibility.txt index a78d1fc13..e007e98dd 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; }