zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Yet another round of trailing whitespace.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6400 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-07-29 20:39:46 +00:00
parent d89909997c
commit 0f54975751
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/Windows/msvc.mak
View file

@ -179,7 +179,7 @@ ENGINE_OBJS= \
$(ENGINE_OBJ)\mhk.$o \ $(ENGINE_OBJ)\mhk.$o \
$(ENGINE_OBJ)\pngwrite.$o \ $(ENGINE_OBJ)\pngwrite.$o \
$(ENGINE_OBJ)\miniz.$o $(ENGINE_OBJ)\miniz.$o
ENGINE_EDITOR_OBJS=$(ENGINE_OBJ)\build.$o \ ENGINE_EDITOR_OBJS=$(ENGINE_OBJ)\build.$o \
$(ENGINE_OBJ)\startwin.editor.$o \ $(ENGINE_OBJ)\startwin.editor.$o \

4
source/build/include/miniz.h
View file

@ -116,7 +116,7 @@
/* Defines to completely disable specific portions of miniz.c: /* Defines to completely disable specific portions of miniz.c:
If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. */ If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. */
/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */ /* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */
@ -139,7 +139,7 @@
/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */ /* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */ /*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. /* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */ functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */

6
source/build/src/miniz.c
View file

@ -6092,8 +6092,8 @@ mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_n
if (!pState->m_zip64) if (!pState->m_zip64)
{ {
/* Bail early if the archive would obviously become too large */ /* Bail early if the archive would obviously become too large */
if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size
+ MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len + + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len +
pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len
+ MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF) + MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF)
{ {
@ -6362,7 +6362,7 @@ mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name,
if (!pState->m_zip64) if (!pState->m_zip64)
{ {
/* Bail early if the archive would obviously become too large */ /* Bail early if the archive would obviously become too large */
if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE
+ archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024 + archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024
+ MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF) + MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF)
{ {

2
source/build/src/pngwrite.cpp
View file

@ -62,7 +62,7 @@ void png_write(FILE * const file, uint32_t const width, uint32_t const height,
uint8_t type, uint8_t const * const data) uint8_t type, uint8_t const * const data)
{ {
png.file = file; png.file = file;
png_write_buf("\x89\x50\x4E\x47\x0D\x0A\x1A\x0A", 8); png_write_buf("\x89\x50\x4E\x47\x0D\x0A\x1A\x0A", 8);
png_ihdr_t const png_header = { B_BIG32(width), B_BIG32(height), 8, type, 0 }; png_ihdr_t const png_header = { B_BIG32(width), B_BIG32(height), 8, type, 0 };

4
source/build/src/screenshot.cpp
View file

@ -166,7 +166,7 @@ int screencapture_tga(const char *filename, char inverseit)
Bfwrite(head, 18, 1, fil); Bfwrite(head, 18, 1, fil);
// palette first // palette first
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (!HICOLOR) if (!HICOLOR)
#endif #endif
@ -201,7 +201,7 @@ int screencapture_tga(const char *filename, char inverseit)
uint8_t *inversebuf = (uint8_t *) Xmalloc(size); uint8_t *inversebuf = (uint8_t *) Xmalloc(size);
bglReadPixels(0, 0, xdim, ydim, GL_RGB, GL_UNSIGNED_BYTE, inversebuf); bglReadPixels(0, 0, xdim, ydim, GL_RGB, GL_UNSIGNED_BYTE, inversebuf);
for (i = 0; i < size; i += 3) for (i = 0; i < size; i += 3)
swapchar(&inversebuf[i], &inversebuf[i + 2]); swapchar(&inversebuf[i], &inversebuf[i + 2]);

6
source/duke3d/src/gamedef.cpp
View file

@ -192,7 +192,7 @@ const tokenmap_t altkeyw [] =
{ "findnearspritez", CON_FINDNEARSPRITEZVAR }, { "findnearspritez", CON_FINDNEARSPRITEZVAR },
}; };
const char *keyw[] = { const char *keyw[] = {
"else", // 0 used with if checks "else", // 0 used with if checks
"actor", // 1 defines an actor "actor", // 1 defines an actor
"addammo", // 2 adds ammo to a weapon "addammo", // 2 adds ammo to a weapon
@ -382,7 +382,7 @@ const char *keyw[] = {
"myospalx", // 186 "myospalx", // 186
"gmaxammo", // 187 "gmaxammo", // 187
"smaxammo", // 188 "smaxammo", // 188
"startlevel", // 189 "startlevel", // 189
NULL, // 190 Beginning of EDuke32 NULL, // 190 Beginning of EDuke32
NULL, // 191 NULL, // 191
"rotatesprite", // 192 "rotatesprite", // 192
@ -6172,7 +6172,7 @@ static void C_AddDefaultDefinitions(void)
C_AddDefinition(tempbuf, i, LABEL_DEFINE); C_AddDefinition(tempbuf, i, LABEL_DEFINE);
} }
tokenmap_t predefined[] = { tokenmap_t predefined[] = {
{ "STAT_DEFAULT", STAT_DEFAULT }, { "STAT_DEFAULT", STAT_DEFAULT },
{ "STAT_ACTOR", STAT_ACTOR }, { "STAT_ACTOR", STAT_ACTOR },
{ "STAT_ZOMBIEACTOR", STAT_ZOMBIEACTOR }, { "STAT_ZOMBIEACTOR", STAT_ZOMBIEACTOR },

2
source/duke3d/src/gameexec.cpp
View file

@ -4292,7 +4292,7 @@ finish_qsprintf:
if (tw == CON_CHECKAVAILWEAPON) if (tw == CON_CHECKAVAILWEAPON)
P_CheckWeapon(g_player[tw].ps); P_CheckWeapon(g_player[tw].ps);
else else
P_SelectNextInvItem(g_player[tw].ps); P_SelectNextInvItem(g_player[tw].ps);
continue; continue;