zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/coelckers/gzdoom

This commit is contained in:
Rachael Alexanderson 2017-05-25 10:39:14 -04:00
parent d757279c92 d633e8afc1
commit 5c30a99aa9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -46,7 +46,6 @@ matrix:
compiler: gcc compiler: gcc
env: env:
- GCC_VERSION=7 - GCC_VERSION=7
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel"
addons: addons:
apt: apt:
sources: sources:
@ -58,15 +57,15 @@ matrix:
- os: linux - os: linux
compiler: clang compiler: clang
env: env:
- CLANG_VERSION=3.9 - CLANG_VERSION=4.0
- CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Debug -DDYN_OPENAL=NO -DDYN_SNDFILE=NO -DDYN_MPG123=NO -DDYN_FLUIDSYNTH=NO" - CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=MinSizeRel -DDYN_OPENAL=NO -DDYN_SNDFILE=NO -DDYN_MPG123=NO -DDYN_FLUIDSYNTH=NO"
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-4.0
packages: packages:
- clang-3.9 - clang-4.0
- libstdc++-5-dev - libstdc++-5-dev
- libsdl2-dev - libsdl2-dev
- libgme-dev - libgme-dev

3
src/p_ceiling.cpp
View File

@ -593,8 +593,9 @@ bool EV_CeilingCrushStop (int tag, bool remove)
bool EV_StopCeiling(int tag, line_t *line) bool EV_StopCeiling(int tag, line_t *line)
{ {
int sec;
FSectorTagIterator it(tag, line); FSectorTagIterator it(tag, line);
while (int sec = it.Next()) while ((sec = it.Next()) >= 0)
{ {
if (level.sectors[sec].ceilingdata) if (level.sectors[sec].ceilingdata)
{ {

3
src/p_floor.cpp
View File

@ -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. // same as above but stops any floor mover that was active on the given sector.
bool EV_StopFloor(int tag, line_t *line) bool EV_StopFloor(int tag, line_t *line)
{ {
int sec;
FSectorTagIterator it(tag, line); FSectorTagIterator it(tag, line);
while (int sec = it.Next()) while ((sec = it.Next()) >= 0)
{ {
if (level.sectors[sec].floordata) if (level.sectors[sec].floordata)
{ {