vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Monster Iestyn 2018-12-20 16:41:21 +00:00
parent 1e15f2365d 25f0dc7eae
commit dfbbab35f4
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/d_netcmd.c
View file

@ -3440,7 +3440,7 @@ static void Command_Version_f(void)
#elif defined(__linux__) #elif defined(__linux__)
CONS_Printf("Linux "); CONS_Printf("Linux ");
#elif defined(MACOSX) #elif defined(MACOSX)
CONS_Printf("macOS" ); CONS_Printf("macOS ");
#elif defined(UNIXCOMMON) #elif defined(UNIXCOMMON)
CONS_Printf("Unix (Common) "); CONS_Printf("Unix (Common) ");
#else #else
@ -3465,6 +3465,11 @@ static void Command_Version_f(void)
CONS_Printf("\x85" "DEBUG " "\x80"); CONS_Printf("\x85" "DEBUG " "\x80");
#endif #endif
// DEVELOP build
#ifdef DEVELOP
CONS_Printf("\x87" "DEVELOP " "\x80");
#endif
CONS_Printf("\n"); CONS_Printf("\n");
} }

2
src/p_setup.c
View file

@ -2002,7 +2002,7 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count, const char *lumpname
if (!count || count >= 0x20000) if (!count || count >= 0x20000)
return false; return false;
CONS_Printf("Reading blockmap lump for pk3...\n"); //CONS_Printf("Reading blockmap lump for pk3...\n");
// no need to malloc anything, assume the data is uncompressed for now // no need to malloc anything, assume the data is uncompressed for now
count /= 2; count /= 2;