diff --git a/source/build/include/baselayer.h b/source/build/include/baselayer.h index a551d977c..abcdf7458 100644 --- a/source/build/include/baselayer.h +++ b/source/build/include/baselayer.h @@ -87,7 +87,7 @@ extern float g_videoGamma, g_videoContrast, g_videoBrightness; #ifdef USE_OPENGL extern int32_t (*baselayer_osdcmd_vidmode_func)(osdfuncparm_t const * const parm); -extern int32_t osdcmd_glinfo(osdfuncparm_t const * const parm); +extern int32_t osdcmd_glinfo(osdfuncparm_t const * parm); struct glinfo_t { const char *vendor; @@ -224,13 +224,13 @@ void keyFlushChars(void); int32_t mouseInit(void); void mouseUninit(void); -int32_t mouseReadAbs(vec2_t *const destination, vec2_t const *const source); +int32_t mouseReadAbs(vec2_t *pResult, vec2_t const *pInput); void mouseGrabInput(bool grab); void mouseLockToWindow(char a); -void mouseReadButtons(int32_t *b); +void mouseReadButtons(int32_t *pResult); void mouseReadPos(int32_t *x, int32_t *y); -void joyReadButtons(int32_t *b); +void joyReadButtons(int32_t *pResult); void joySetDeadZone(int32_t axis, uint16_t dead, uint16_t satur); void joyGetDeadZone(int32_t axis, uint16_t *dead, uint16_t *satur); extern int32_t inputchecked; diff --git a/source/build/include/build.h b/source/build/include/build.h index 1a587781d..da4745423 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1022,7 +1022,7 @@ int32_t engineInit(void); int32_t enginePostInit(void); void engineUnInit(void); void initspritelists(void); -int32_t engineFatalError(char const * const msg); +int32_t engineFatalError(char const * msg); int32_t engineLoadBoard(const char *filename, char flags, vec3_t *dapos, int16_t *daang, int16_t *dacursectnum); int32_t engineLoadMHK(const char *filename); @@ -1032,16 +1032,16 @@ int32_t engineLoadClipMaps(void); #endif int32_t saveboard(const char *filename, const vec3_t *dapos, int16_t daang, int16_t dacursectnum); -void tileSetupDummy(int32_t const tile); -void tileSetData(int32_t const tile, int32_t tsiz, char const *const buffer); -void tileDelete(int32_t const tile); +void tileSetupDummy(int32_t tile); +void tileSetData(int32_t tile, int32_t tsiz, char const *buffer); +void tileDelete(int32_t tile); void tileSetSize(int32_t picnum, int16_t dasizx, int16_t dasizy); -int32_t artReadHeader(int32_t const fil, char const *const fn, artheader_t *const local); -int32_t artReadHeaderFromBuffer(uint8_t const *const buf, artheader_t *const local); -int32_t artCheckUnitFileHeader(uint8_t const *const buf, int32_t length); -void tileConvertAnimFormat(int32_t const picnum); -void artReadManifest(int32_t const fil, artheader_t const *const local); -void artPreloadFile(int32_t const fil, artheader_t const *const local); +int32_t artReadHeader(int32_t fil, char const *fn, artheader_t *local); +int32_t artReadHeaderFromBuffer(uint8_t const *buf, artheader_t *local); +int32_t artCheckUnitFileHeader(uint8_t const *buf, int32_t length); +void tileConvertAnimFormat(int32_t picnum); +void artReadManifest(int32_t fil, artheader_t const *local); +void artPreloadFile(int32_t fil, artheader_t const *local); int32_t artLoadFiles(const char *filename, int32_t askedsize); void artClearMapArt(void); void artSetupMapArt(const char *filename); @@ -1086,7 +1086,7 @@ void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnu int8_t dashade, char dapalnum, int32_t dastat, uint8_t daalpha, uint8_t dablend, int32_t cx1, int32_t cy1, int32_t cx2, int32_t cy2); void renderDrawLine(int32_t x1, int32_t y1, int32_t x2, int32_t y2, char col); -void drawlinergb(int32_t x1, int32_t y1, int32_t x2, int32_t y2, palette_t col); +void drawlinergb(int32_t x1, int32_t y1, int32_t x2, int32_t y2, palette_t p); int32_t printext16(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, const char *name, char fontsize) ATTRIBUTE((nonnull(5))); void printext256(int32_t xpos, int32_t ypos, int16_t col, int16_t backcol, @@ -1122,7 +1122,7 @@ static FORCE_INLINE void rotatesprite_win(int32_t sx, int32_t sy, int32_t z, int void bfirst_search_init(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int32_t maxnum, int16_t firstelt); void bfirst_search_try(int16_t *list, uint8_t *bitmap, int32_t *eltnumptr, int16_t elt); -void getzrange(const vec3_t *vect, int16_t sectnum, int32_t *ceilz, int32_t *ceilhit, int32_t *florz, +void getzrange(const vec3_t *pos, int16_t sectnum, int32_t *ceilz, int32_t *ceilhit, int32_t *florz, int32_t *florhit, int32_t walldist, uint32_t cliptype) ATTRIBUTE((nonnull(1,3,4,5,6))); int32_t hitscan(const vec3_t *sv, int16_t sectnum, int32_t vx, int32_t vy, int32_t vz, hitdata_t *hitinfo, uint32_t cliptype) ATTRIBUTE((nonnull(1,6))); @@ -1206,7 +1206,7 @@ static FORCE_INLINE int32_t E_SpriteIsValid(const int32_t i) return ((unsigned)i < MAXSPRITES && sprite[i].statnum != MAXSTATUS); } -int clipshape_idx_for_sprite(uspritetype const * const curspr, int curidx); +int clipshape_idx_for_sprite(uspritetype const * curspr, int curidx); void alignceilslope(int16_t dasect, int32_t x, int32_t y, int32_t z); void alignflorslope(int16_t dasect, int32_t x, int32_t y, int32_t z); @@ -1351,7 +1351,7 @@ int32_t hicsetsubsttex(int32_t picnum, int32_t palnum, const char *filen, float int32_t hicsetskybox(int32_t picnum, int32_t palnum, char *faces[6], int32_t flags); int32_t hicclearsubst(int32_t picnum, int32_t palnum); -int32_t Ptile2tile(int32_t tile, int32_t pallet) ATTRIBUTE((pure)); +int32_t Ptile2tile(int32_t tile, int32_t palette) ATTRIBUTE((pure)); int32_t md_loadmodel(const char *fn); int32_t md_setmisc(int32_t modelid, float scale, int32_t shadeoff, float zadd, float yoffset, int32_t flags); // int32_t md_tilehasmodel(int32_t tilenume, int32_t pal); diff --git a/source/build/include/clip.h b/source/build/include/clip.h index 4d0f340d1..d7ed8effc 100644 --- a/source/build/include/clip.h +++ b/source/build/include/clip.h @@ -61,8 +61,8 @@ extern int16_t *sectq; extern int16_t pictoidx[MAXTILES]; // maps tile num to clipinfo[] index extern int16_t clipspritelist[MAXCLIPNUM]; extern void engineSetClipMap(mapinfo_t *bak, mapinfo_t *newmap); -extern int32_t clipsprite_try(uspritetype const * const spr, int32_t xmin, int32_t ymin, int32_t xmax, int32_t ymax); -extern int32_t clipsprite_initindex(int32_t curidx, uspritetype const * const curspr, int32_t *clipsectcnt, const vec3_t *vect); +extern int32_t clipsprite_try(uspritetype const * spr, int32_t xmin, int32_t ymin, int32_t xmax, int32_t ymax); +extern int32_t clipsprite_initindex(int32_t curidx, uspritetype const * curspr, int32_t *clipsectcnt, const vec3_t *vect); #endif // HAVE_CLIPSHAPE_FEATURE typedef struct @@ -81,7 +81,7 @@ int clipinsideboxline(int x, int y, int x1, int y1, int x2, int y2, int walldist extern int32_t clipmoveboxtracenum; -int32_t clipmove(vec3_t *vect, int16_t *sectnum, int32_t xvect, int32_t yvect, int32_t walldist, int32_t ceildist, +int32_t clipmove(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect, int32_t walldist, int32_t ceildist, int32_t flordist, uint32_t cliptype) ATTRIBUTE((nonnull(1, 2))); int32_t clipmovex(vec3_t *pos, int16_t *sectnum, int32_t xvect, int32_t yvect, int32_t walldist, int32_t ceildist, int32_t flordist, uint32_t cliptype, uint8_t noslidep) ATTRIBUTE((nonnull(1, 2))); diff --git a/source/build/include/common.h b/source/build/include/common.h index 6bef3be38..3e58da83d 100644 --- a/source/build/include/common.h +++ b/source/build/include/common.h @@ -97,7 +97,7 @@ void fnlist_clearnames(fnlist_t *fnl); int32_t fnlist_getnames(fnlist_t *fnl, const char *dirname, const char *pattern, int32_t dirflags, int32_t fileflags); -char *dup_filename(const char *fn); + int32_t maybe_append_ext(char *wbuf, int32_t wbufsiz, const char *fn, const char *ext); // Approximations to 2D and 3D Euclidean distances. Initial EDuke32 SVN import says diff --git a/source/build/include/fix16.h b/source/build/include/fix16.h index 03a64f8e2..eb532e49d 100644 --- a/source/build/include/fix16.h +++ b/source/build/include/fix16.h @@ -123,7 +123,7 @@ extern fix16_t fix16_mul(fix16_t inArg0, fix16_t inArg1) FIXMATH_FUNC_ATTRS; /*! Divides the first given fix16_t by the second and returns the result. */ -extern fix16_t fix16_div(fix16_t inArg0, fix16_t inArg1) FIXMATH_FUNC_ATTRS; +extern fix16_t fix16_div(fix16_t a, fix16_t b) FIXMATH_FUNC_ATTRS; #ifndef FIXMATH_NO_OVERFLOW /*! Performs a saturated multiplication (overflow-protected) of the two given fix16_t's and returns the result. diff --git a/source/build/include/hash.h b/source/build/include/hash.h index e3d2bcc04..e36e61f0b 100644 --- a/source/build/include/hash.h +++ b/source/build/include/hash.h @@ -26,8 +26,8 @@ typedef struct void hash_init(hashtable_t *t); void hash_loop(hashtable_t *t, void(*func)(const char *, intptr_t)); void hash_free(hashtable_t *t); -intptr_t hash_findcase(hashtable_t const * const t, char const * const s); -intptr_t hash_find(hashtable_t const * const t, char const * const s); +intptr_t hash_findcase(hashtable_t const * t, char const * s); +intptr_t hash_find(hashtable_t const * t, char const * s); void hash_add(hashtable_t *t, const char *s, intptr_t key, int32_t replace); void hash_delete(hashtable_t *t, const char *s); diff --git a/source/build/include/lz4.h b/source/build/include/lz4.h index bd8940af5..1f8eafc2b 100644 --- a/source/build/include/lz4.h +++ b/source/build/include/lz4.h @@ -141,7 +141,7 @@ LZ4LIB_API const char* LZ4_versionString (void); /**< library version string; dstCapacity : size of buffer 'dst' (which must be already allocated) return : the number of bytes written into buffer 'dst' (necessarily <= dstCapacity) or 0 if compression fails */ -LZ4LIB_API int LZ4_compress_default(const char* src, char* dst, int srcSize, int dstCapacity); +LZ4LIB_API int LZ4_compress_default(const char* source, char* dest, int inputSize, int maxOutputSize); /*! LZ4_decompress_safe() : compressedSize : is the exact complete size of the compressed block. @@ -151,7 +151,7 @@ LZ4LIB_API int LZ4_compress_default(const char* src, char* dst, int srcSize, int If the source stream is detected malformed, the function will stop decoding and return a negative result. This function is protected against malicious data packets. */ -LZ4LIB_API int LZ4_decompress_safe (const char* src, char* dst, int compressedSize, int dstCapacity); +LZ4LIB_API int LZ4_decompress_safe (const char* source, char* dest, int compressedSize, int maxDecompressedSize); /*-************************************ @@ -170,7 +170,7 @@ LZ4_compressBound() : return : maximum output size in a "worst case" scenario or 0, if input size is incorrect (too large or negative) */ -LZ4LIB_API int LZ4_compressBound(int inputSize); +LZ4LIB_API int LZ4_compressBound(int isize); /*! LZ4_compress_fast() : @@ -180,7 +180,7 @@ LZ4_compress_fast() : An acceleration value of "1" is the same as regular LZ4_compress_default() Values <= 0 will be replaced by ACCELERATION_DEFAULT (currently == 1, see lz4.c). */ -LZ4LIB_API int LZ4_compress_fast (const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); +LZ4LIB_API int LZ4_compress_fast (const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration); /*! @@ -191,7 +191,7 @@ LZ4_compress_fast_extState() : Then, provide it as 'void* state' to compression function. */ LZ4LIB_API int LZ4_sizeofState(void); -LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); +LZ4LIB_API int LZ4_compress_fast_extState (void* state, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration); /*! @@ -221,7 +221,7 @@ but doesn't provide any security guarantee. It also doesn't know 'src' size, and implies it's >= compressed size. Use this function in trusted environment **only**. */ -LZ4LIB_API int LZ4_decompress_fast (const char* src, char* dst, int originalSize); +LZ4LIB_API int LZ4_decompress_fast (const char* source, char* dest, int originalSize); /*! LZ4_decompress_safe_partial() : @@ -235,7 +235,7 @@ LZ4_decompress_safe_partial() : If source stream is detected malformed, function returns a negative result. This function is protected against malicious data packets. */ -LZ4LIB_API int LZ4_decompress_safe_partial (const char* src, char* dst, int srcSize, int targetOutputSize, int dstCapacity); +LZ4LIB_API int LZ4_decompress_safe_partial (const char* source, char* dest, int compressedSize, int targetOutputSize, int maxDecompressedSize); /*-********************************************* @@ -248,13 +248,13 @@ typedef union LZ4_stream_u LZ4_stream_t; /* incomplete type (defined later) */ * LZ4_freeStream() releases its memory. */ LZ4LIB_API LZ4_stream_t* LZ4_createStream(void); -LZ4LIB_API int LZ4_freeStream (LZ4_stream_t* streamPtr); +LZ4LIB_API int LZ4_freeStream (LZ4_stream_t* LZ4_stream); /*! LZ4_resetStream() : * An LZ4_stream_t structure can be allocated once and re-used multiple times. * Use this function to start compressing a new stream. */ -LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* streamPtr); +LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* LZ4_stream); /*! LZ4_loadDict() : * Use this function to load a static dictionary into LZ4_stream_t. @@ -262,7 +262,7 @@ LZ4LIB_API void LZ4_resetStream (LZ4_stream_t* streamPtr); * Loading a size of 0 is allowed, and is the same as reset. * @return : dictionary size, in bytes (necessarily <= 64 KB) */ -LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, int dictSize); +LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* LZ4_dict, const char* dictionary, int dictSize); /*! LZ4_compress_fast_continue() : * Compress 'src' content using data from previously compressed blocks, for better compression ratio. @@ -280,7 +280,7 @@ LZ4LIB_API int LZ4_loadDict (LZ4_stream_t* streamPtr, const char* dictionary, in * or 0 if there is an error (typically, cannot fit into 'dst'). * After an error, the stream status is invalid, it can only be reset or freed. */ -LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* src, char* dst, int srcSize, int dstCapacity, int acceleration); +LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* LZ4_stream, const char* source, char* dest, int inputSize, int maxOutputSize, int acceleration); /*! LZ4_saveDict() : * If last 64KB data cannot be guaranteed to remain available at its current memory location, @@ -289,7 +289,7 @@ LZ4LIB_API int LZ4_compress_fast_continue (LZ4_stream_t* streamPtr, const char* * but is much faster, because LZ4_saveDict() doesn't need to rebuild tables. * @return : saved dictionary size in bytes (necessarily <= maxDictSize), or 0 if error. */ -LZ4LIB_API int LZ4_saveDict (LZ4_stream_t* streamPtr, char* safeBuffer, int maxDictSize); +LZ4LIB_API int LZ4_saveDict (LZ4_stream_t* LZ4_dict, char* safeBuffer, int maxDictSize); /*-********************************************** @@ -332,8 +332,8 @@ LZ4LIB_API int LZ4_setStreamDecode (LZ4_streamDecode_t* LZ4_streamDecode, const * Whenever these conditions are not possible, save the last 64KB of decoded data into a safe buffer, * and indicate where it is saved using LZ4_setStreamDecode() before decompressing next block. */ -LZ4LIB_API int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int srcSize, int dstCapacity); -LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* src, char* dst, int originalSize); +LZ4LIB_API int LZ4_decompress_safe_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int compressedSize, int maxOutputSize); +LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecode, const char* source, char* dest, int originalSize); /*! LZ4_decompress_*_usingDict() : @@ -341,8 +341,8 @@ LZ4LIB_API int LZ4_decompress_fast_continue (LZ4_streamDecode_t* LZ4_streamDecod * a combination of LZ4_setStreamDecode() followed by LZ4_decompress_*_continue() * They are stand-alone, and don't need an LZ4_streamDecode_t structure. */ -LZ4LIB_API int LZ4_decompress_safe_usingDict (const char* src, char* dst, int srcSize, int dstCapcity, const char* dictStart, int dictSize); -LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int originalSize, const char* dictStart, int dictSize); +LZ4LIB_API int LZ4_decompress_safe_usingDict (const char* source, char* dest, int compressedSize, int maxOutputSize, const char* dictStart, int dictSize); +LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* source, char* dest, int originalSize, const char* dictStart, int dictSize); /*^********************************************** @@ -378,7 +378,7 @@ LZ4LIB_API int LZ4_decompress_fast_usingDict (const char* src, char* dst, int or * call that fully reset the state (LZ4_compress_fast_extState()) and that * returned success */ -LZ4LIB_API void LZ4_resetStream_fast (LZ4_stream_t* streamPtr); +LZ4LIB_API void LZ4_resetStream_fast (LZ4_stream_t* ctx); /*! LZ4_compress_fast_extState_fastReset() : * A variant of LZ4_compress_fast_extState(). @@ -557,9 +557,9 @@ LZ4_DEPRECATED("use LZ4_decompress_safe() instead") LZ4LIB_API int LZ4_uncompres * achieved will therefore be no better than compressing each chunk * independently. */ -LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API void* LZ4_create (char* inputBuffer); +LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API void* LZ4_create (const char* inputBuffer); LZ4_DEPRECATED("Use LZ4_createStream() instead") LZ4LIB_API int LZ4_sizeofStreamState(void); -LZ4_DEPRECATED("Use LZ4_resetStream() instead") LZ4LIB_API int LZ4_resetStreamState(void* state, char* inputBuffer); +LZ4_DEPRECATED("Use LZ4_resetStream() instead") LZ4LIB_API int LZ4_resetStreamState(void* state, const char* inputBuffer); LZ4_DEPRECATED("Use LZ4_saveDict() instead") LZ4LIB_API char* LZ4_slideInputBuffer (void* state); /* Obsolete streaming decoding functions */ diff --git a/source/build/include/m32script.h b/source/build/include/m32script.h index e39156828..c53386342 100644 --- a/source/build/include/m32script.h +++ b/source/build/include/m32script.h @@ -40,7 +40,7 @@ extern char *apStrings[MAXQUOTES+1], *apXStrings[MAXQUOTES+1]; extern int32_t g_numQuoteRedefinitions; extern int32_t VM_Execute(int32_t once); -extern void VM_OnEvent(int32_t iEventID, int32_t iActor); +extern void VM_OnEvent(int32_t iEventID, int32_t spriteNum); extern void VM_ScriptInfo(void); extern void VM_Disasm(ofstype beg, int32_t size); @@ -175,7 +175,7 @@ extern int32_t m32_sortvar1, m32_sortvar2; //extern int32_t g_scriptDebug; -extern int32_t g_numQuoteRedefinitions; + extern hashtable_t h_gamevars; extern hashtable_t h_arrays; diff --git a/source/build/include/miniz_tinfl.h b/source/build/include/miniz_tinfl.h index 8cb8cdaee..861f76861 100644 --- a/source/build/include/miniz_tinfl.h +++ b/source/build/include/miniz_tinfl.h @@ -96,7 +96,7 @@ typedef enum { /* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */ /* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */ -tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags); +tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, mz_uint32 decomp_flags); /* Internal/private bits follow. */ enum diff --git a/source/build/include/mmulti.h b/source/build/include/mmulti.h index c68fdd58f..2e00bffcc 100644 --- a/source/build/include/mmulti.h +++ b/source/build/include/mmulti.h @@ -21,10 +21,10 @@ void sendlogon(void); void sendlogoff(void); int getoutputcirclesize(void); void setsocket(int newsocket); -void sendpacket(int other, unsigned char *bufptr, int messleng); -int getpacket(int *other, unsigned char *bufptr); +void sendpacket(int other, const unsigned char *bufptr, int messleng); +int getpacket(const int *other, const unsigned char *bufptr); void flushpackets(void); -void genericmultifunction(int other, unsigned char *bufptr, int messleng, int command); +void genericmultifunction(int other, const unsigned char *bufptr, int messleng, int command); int isvalidipaddress(const char *st); #endif // mmulti_h_ diff --git a/source/build/include/osd.h b/source/build/include/osd.h index 1b30778b0..c2fa1b0ba 100644 --- a/source/build/include/osd.h +++ b/source/build/include/osd.h @@ -238,12 +238,12 @@ void OSD_SetFunctions(void (*drawchar)(int32_t, int32_t, char, int32_t, int32_t) int32_t (*colwidth)(int32_t), int32_t (*rowheight)(int32_t), void (*clearbg)(int32_t, int32_t), - int32_t (*gettime)(void), - void (*onshow)(int32_t)); + int32_t (*gtime)(void), + void (*showosd)(int32_t)); // sets the parameters for presenting the text void OSD_SetParameters(int32_t promptShade, int32_t promptPal, int32_t editShade, int32_t editPal, int32_t textShade, int32_t textPal, - char const *const errorStr, char const *const highlight, uint32_t flags); + char const *errorStr, char const *highlight, uint32_t flags); // sets the scancode for the key which activates the onscreen display void OSD_CaptureKey(uint8_t scanCode); @@ -286,8 +286,8 @@ int32_t OSD_Dispatch(const char *cmd); // func = the entry point to the function int32_t OSD_RegisterFunction(const char *pszName, const char *pszDesc, int32_t (*func)(const osdfuncparm_t *)); -int32_t osdcmd_cvar_set(osdfuncparm_t const * const parm); -void OSD_RegisterCvar(osdcvardata_t * const cvar, int32_t (*func)(osdfuncparm_t const * const)); +int32_t osdcmd_cvar_set(osdfuncparm_t const * parm); +void OSD_RegisterCvar(osdcvardata_t * cvar, int32_t (*func)(osdfuncparm_t const * const)); void OSD_WriteAliases(FILE *fp); void OSD_WriteCvars(FILE *fp); @@ -297,7 +297,7 @@ static inline void OSD_SetHistory(int32_t histIdx, const char *src) Bstrncpyz(osd->history.buf[histIdx], src, OSDEDITLENGTH); } -extern int32_t osdcmd_restartvid(osdfuncparm_t const * const parm); +extern int32_t osdcmd_restartvid(osdfuncparm_t const * parm); extern void M32RunScript(const char *s); diff --git a/source/build/include/pngwrite.h b/source/build/include/pngwrite.h index 8ae2daf35..f66a73950 100644 --- a/source/build/include/pngwrite.h +++ b/source/build/include/pngwrite.h @@ -30,8 +30,8 @@ typedef struct } png_ihdr_t; #pragma pack(pop) -void png_set_pal(uint8_t const * const data, int numentries); -void png_set_text(char const * const keyword, char const * const text); -void png_write(FILE * const file, uint32_t const width, uint32_t const height, uint8_t const type, uint8_t const * const data); +void png_set_pal(uint8_t const * data, int numentries); +void png_set_text(char const * keyword, char const * text); +void png_write(FILE * file, uint32_t width, uint32_t height, uint8_t type, uint8_t const * data); #endif diff --git a/source/build/include/polymer.h b/source/build/include/polymer.h index f5c8b2df1..56de0d168 100644 --- a/source/build/include/polymer.h +++ b/source/build/include/polymer.h @@ -364,7 +364,7 @@ int16_t polymer_addlight(_prlight* light); void polymer_deletelight(int16_t lighti); void polymer_invalidatelights(void); void polymer_texinvalidate(void); -void polymer_definehighpalookup(char basepalnum, char palnum, char *fn); +void polymer_definehighpalookup(char basepalnum, char palnum, char *data); int32_t polymer_havehighpalookup(int32_t basepalnum, int32_t palnum); @@ -399,7 +399,7 @@ static void polymer_emptybuckets(void); static _prbucket* polymer_findbucket(int16_t tilenum, char pal); static void polymer_bucketplane(_prplane* plane); static void polymer_drawplane(_prplane* plane); -static inline void polymer_inb4mirror(_prvert* buffer, GLfloat* plane); +static inline void polymer_inb4mirror(_prvert* buffer, const GLfloat* plane); static void polymer_animatesprites(void); static void polymer_freeboard(void); // SECTORS @@ -416,12 +416,12 @@ static void polymer_updatewall(int16_t wallnum); static void polymer_drawwall(int16_t sectnum, int16_t wallnum); // HSR static void polymer_computeplane(_prplane* p); -static inline void polymer_crossproduct(GLfloat* in_a, GLfloat* in_b, GLfloat* out); -static inline void polymer_transformpoint(const float* inpos, float* pos, float* matrix); +static inline void polymer_crossproduct(const GLfloat* in_a, const GLfloat* in_b, GLfloat* out); +static inline void polymer_transformpoint(const float* inpos, float* pos, const float* matrix); static inline void polymer_normalize(float* vec); static inline void polymer_pokesector(int16_t sectnum); static void polymer_extractfrustum(GLfloat* modelview, GLfloat* projection, float* frustum); -static inline int32_t polymer_planeinfrustum(_prplane *plane, float* frustum); +static inline int32_t polymer_planeinfrustum(_prplane *plane, const float* frustum); static inline void polymer_scansprites(int16_t sectnum, uspritetype* tsprite, int32_t* spritesortcnt); static void polymer_updatesprite(int32_t snum); // SKIES @@ -437,7 +437,7 @@ static void polymer_loadmodelvbos(md3model_t* m); // MATERIALS static void polymer_getscratchmaterial(_prmaterial* material); static _prbucket* polymer_getbuildmaterial(_prmaterial* material, int16_t tilenum, char pal, int8_t shade, int8_t vis, int32_t cmeth); -static int32_t polymer_bindmaterial(const _prmaterial *material, int16_t* lights, int lightcount); +static int32_t polymer_bindmaterial(const _prmaterial *material, const int16_t* lights, int lightcount); static void polymer_unbindmaterial(int32_t programbits); static void polymer_compileprogram(int32_t programbits); // LIGHTS @@ -461,17 +461,17 @@ void PR_CALLBACK polymer_debugoutputcallback(GLenum source,GLenum type,GLuint #define SWITCH_CULL_DIRECTION { culledface = (culledface == GL_FRONT) ? GL_BACK : GL_FRONT; glCullFace(culledface); } -static inline GLfloat dot2f(GLfloat *v1, GLfloat *v2) +static inline GLfloat dot2f(const GLfloat *v1, const GLfloat *v2) { return v1[0]*v2[0] + v1[1]*v2[1]; } -static inline GLfloat dot3f(GLfloat *v1, GLfloat *v2) +static inline GLfloat dot3f(const GLfloat *v1, const GLfloat *v2) { return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2]; } -static inline void relvec2f(GLfloat *v1, GLfloat *v2, GLfloat *out) +static inline void relvec2f(const GLfloat *v1, const GLfloat *v2, GLfloat *out) { out[0] = v2[0]-v1[0]; out[1] = v2[1]-v1[1]; diff --git a/source/build/include/texcache.h b/source/build/include/texcache.h index 6d805586f..c3d65c963 100644 --- a/source/build/include/texcache.h +++ b/source/build/include/texcache.h @@ -64,10 +64,10 @@ int texcache_readdata(void *outBuf, int32_t len); extern pthtyp *texcache_fetch(int32_t dapicnum, int32_t dapalnum, int32_t dashade, int32_t dameth); extern int32_t texcache_loadskin(const texcacheheader *head, int32_t *doalloc, GLuint *glpic, vec2_t *siz); extern int32_t texcache_loadtile(const texcacheheader *head, int32_t *doalloc, pthtyp *pth); -extern char const * texcache_calcid(char *cachefn, const char *fn, const int32_t len, const int32_t dameth, const char effect); +extern char const * texcache_calcid(char *outbuf, const char *filename, int32_t len, int32_t dameth, char effect); extern void texcache_prewritetex(texcacheheader *head); -void texcache_postwritetex(char const * const cacheid, int32_t const offset); -extern void texcache_writetex_fromdriver(char const * cachefn, texcacheheader *head); +void texcache_postwritetex(char const * cacheid, int32_t offset); +extern void texcache_writetex_fromdriver(char const * cacheid, texcacheheader *head); extern int texcache_readtexheader(char const * cacheid, texcacheheader *head, int32_t modelp); extern void texcache_openfiles(void); extern void texcache_setupmemcache(void); diff --git a/source/build/include/xxhash.h b/source/build/include/xxhash.h index d6bad9433..f5920051f 100644 --- a/source/build/include/xxhash.h +++ b/source/build/include/xxhash.h @@ -172,11 +172,11 @@ XXH_PUBLIC_API XXH32_hash_t XXH32 (const void* input, size_t length, unsigned in typedef struct XXH32_state_s XXH32_state_t; /* incomplete type */ XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void); XXH_PUBLIC_API XXH_errorcode XXH32_freeState(XXH32_state_t* statePtr); -XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dst_state, const XXH32_state_t* src_state); +XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState); XXH_PUBLIC_API XXH_errorcode XXH32_reset (XXH32_state_t* statePtr, unsigned int seed); -XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length); -XXH_PUBLIC_API XXH32_hash_t XXH32_digest (const XXH32_state_t* statePtr); +XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t length); +XXH_PUBLIC_API XXH32_hash_t XXH32_digest (const XXH32_state_t* state_in); /* * Streaming functions generate the xxHash of an input provided in multiple segments. @@ -229,11 +229,11 @@ XXH_PUBLIC_API XXH64_hash_t XXH64 (const void* input, size_t length, unsigned lo typedef struct XXH64_state_s XXH64_state_t; /* incomplete type */ XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void); XXH_PUBLIC_API XXH_errorcode XXH64_freeState(XXH64_state_t* statePtr); -XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dst_state, const XXH64_state_t* src_state); +XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState); XXH_PUBLIC_API XXH_errorcode XXH64_reset (XXH64_state_t* statePtr, unsigned long long seed); -XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length); -XXH_PUBLIC_API XXH64_hash_t XXH64_digest (const XXH64_state_t* statePtr); +XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t length); +XXH_PUBLIC_API XXH64_hash_t XXH64_digest (const XXH64_state_t* state_in); /*====== Canonical representation ======*/ typedef struct { unsigned char digest[8]; } XXH64_canonical_t; diff --git a/source/mact/include/control.h b/source/mact/include/control.h index dab53c1d2..cf2180063 100644 --- a/source/mact/include/control.h +++ b/source/mact/include/control.h @@ -190,8 +190,8 @@ extern keybind CONTROL_KeyBinds[MAXBOUNDKEYS+MAXMOUSEBUTTONS]; extern int32_t CONTROL_BindsEnabled; void CONTROL_ClearAllBinds(void); -void CONTROL_BindKey(int i, char const * const cmd, int repeat, char const * const keyname); -void CONTROL_BindMouse(int i, char const * const cmd, int repeat, char const * const keyname); +void CONTROL_BindKey(int i, char const * cmd, int repeat, char const * keyname); +void CONTROL_BindMouse(int i, char const * cmd, int repeat, char const * keyname); void CONTROL_FreeKeyBind(int i); void CONTROL_FreeMouseBind(int i);