thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'next' into public_next

Browse source
This commit is contained in:
Monster Iestyn 2016-06-19 20:47:22 +01:00
commit c723d10dd4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -98,7 +98,7 @@ matrix:
- p7zip-full - p7zip-full
- gcc-6 - gcc-6
compiler: gcc-6 compiler: gcc-6
env: WFLAGS="-Wno-error=tautological-compare" env: WFLAGS="-Wno-tautological-compare"
#gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511 #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
- os: linux - os: linux
compiler: clang compiler: clang
@ -213,7 +213,7 @@ before_script:
- 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets - 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
- mkdir build - mkdir build
- cd build - cd build
- export CFLAGS="-Wall -W $WFLAGS" - export CFLAGS="-Wall -W -Werror $WFLAGS"
- export CCACHE_COMPRESS=true - export CCACHE_COMPRESS=true
- cmake .. -DCMAKE_BUILD_TYPE=Release - cmake .. -DCMAKE_BUILD_TYPE=Release

2
src/p_setup.c
View file

@ -1934,7 +1934,7 @@ static void P_GroupLines(void)
if (sector->linecount == 0) // no lines found? if (sector->linecount == 0) // no lines found?
{ {
sector->lines = NULL; sector->lines = NULL;
CONS_Debug(DBG_SETUP, "P_GroupLines: sector %d has no lines\n", i); CONS_Debug(DBG_SETUP, "P_GroupLines: sector %s has no lines\n", sizeu1(i));
} }
else else
{ {