mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-11-18 18:51:42 +00:00
Merge branch 'next' into public_next
This commit is contained in:
commit
c723d10dd4
2 changed files with 3 additions and 3 deletions
|
@ -98,7 +98,7 @@ matrix:
|
|||
- p7zip-full
|
||||
- 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
|
||||
- os: linux
|
||||
compiler: clang
|
||||
|
@ -213,7 +213,7 @@ before_script:
|
|||
- 7z x $HOME/srb2_cache/SRB2-v2115-assets-2.7z -oassets
|
||||
- mkdir build
|
||||
- cd build
|
||||
- export CFLAGS="-Wall -W $WFLAGS"
|
||||
- export CFLAGS="-Wall -W -Werror $WFLAGS"
|
||||
- export CCACHE_COMPRESS=true
|
||||
- cmake .. -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
|
|
|
@ -1934,7 +1934,7 @@ static void P_GroupLines(void)
|
|||
if (sector->linecount == 0) // no lines found?
|
||||
{
|
||||
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
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue