From 3da02764d5e27d7841d0d00b8dd1e768bbf60916 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 25 May 2017 10:30:55 +0300 Subject: [PATCH 1/2] Updated Travis CI configuration Use MinSizeRel configuration with Clang 4.0 on Linux Use Debug configuration with GCC 7 --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b51120af..3f46053ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ matrix: compiler: gcc env: - GCC_VERSION=7 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel" addons: apt: sources: @@ -58,15 +57,15 @@ matrix: - os: linux compiler: clang env: - - CLANG_VERSION=3.9 - - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DDYN_OPENAL=NO -DDYN_SNDFILE=NO -DDYN_MPG123=NO -DDYN_FLUIDSYNTH=NO" + - CLANG_VERSION=4.0 + - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel -DDYN_OPENAL=NO -DDYN_SNDFILE=NO -DDYN_MPG123=NO -DDYN_FLUIDSYNTH=NO" addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-3.9 + - llvm-toolchain-trusty-4.0 packages: - - clang-3.9 + - clang-4.0 - libstdc++-5-dev - libsdl2-dev - libgme-dev From d633e8afc1c36aafc8a692d9661f97832235e301 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 25 May 2017 10:41:06 +0300 Subject: [PATCH 2/2] Fixed sector iteration with Floor_Stop and Ceiling_Stop action specials https://forum.zdoom.org/viewtopic.php?t=56582 --- src/p_ceiling.cpp | 3 ++- src/p_floor.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index fcd2a5487..fb324b54a 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -593,8 +593,9 @@ bool EV_CeilingCrushStop (int tag, bool remove) bool EV_StopCeiling(int tag, line_t *line) { + int sec; FSectorTagIterator it(tag, line); - while (int sec = it.Next()) + while ((sec = it.Next()) >= 0) { if (level.sectors[sec].ceilingdata) { diff --git a/src/p_floor.cpp b/src/p_floor.cpp index 63ebdc4af..d0b6cb077 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -570,8 +570,9 @@ bool EV_FloorCrushStop (int tag, line_t *line) // same as above but stops any floor mover that was active on the given sector. bool EV_StopFloor(int tag, line_t *line) { + int sec; FSectorTagIterator it(tag, line); - while (int sec = it.Next()) + while ((sec = it.Next()) >= 0) { if (level.sectors[sec].floordata) {