zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.appveyor.yml
View file

@ -24,11 +24,11 @@ environment:
CONFIGURATION: Release CONFIGURATION: Release
TOOLSET: v141 TOOLSET: v141
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
- GENERATOR: "Visual Studio 14 2015 Win64" - GENERATOR: "Visual Studio 15 2017 Win64"
CONFIGURATION: Debug CONFIGURATION: Debug
TOOLSET: v140_xp TOOLSET: v141
APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
build_script: build_script:
- md build - md build
- cd build - cd build

1
src/p_saveg.cpp
View file

@ -73,6 +73,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, line_t &line, line_t *
("alpha", line.alpha, def->alpha) ("alpha", line.alpha, def->alpha)
.Args("args", line.args, def->args, line.special) .Args("args", line.args, def->args, line.special)
("portalindex", line.portalindex, def->portalindex) ("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. // 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) //.Array("sides", line.sidedef, 2)
.EndObject(); .EndObject();

2
wadsrc/static/zscript/level_compatibility.txt
View file

@ -514,6 +514,8 @@ class LevelCompatibility play
ClearSectorTags(34); ClearSectorTags(34);
ClearSectorTags(83); ClearSectorTags(83);
ClearSectorTags(85); ClearSectorTags(85);
// Visually align floors between crushers
SetLineSpecial(3, Transfer_Heights, 14, 6);
break; break;
} }