Merge remote-tracking branch 'origin/master' into asmjit

This commit is contained in:
Magnus Norddahl 2018-10-17 08:55:21 +02:00
commit 6a327ff898
3 changed files with 7 additions and 4 deletions

View file

@ -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

View file

@ -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();

View file

@ -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;
}