Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed compile errors on newer versions of clang

Browse source
This commit is contained in:
smallmodel 2023-09-05 19:39:57 +02:00
parent 5e23a6b640
commit 6d2d35e82d
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
7 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/cgame/cg_public.h
View file

@ -500,7 +500,7 @@ functions exported to the main executable
void (*CG_ReadNonPVSClient)(radarUnpacked_t* radarUnpacked);
void (*CG_UpdateRadar)();
void (*CG_SaveStateToBuffer)(void** out, int svsTime);
void (*CG_LoadStateToBuffer)(void** state, int size, int svsTime);
void (*CG_LoadStateToBuffer)(void* state, int size, int svsTime);
void (*CG_CleanUpTempModels)();
// FIXME

2
code/fgame/g_public.h
View file

@ -252,7 +252,7 @@ typedef struct gameImport_s
char * ( *Argv )( int arg );
char * ( *Args )( );
void ( *AddCommand )( const char *cmdName, xcommand_t cmdFunction );
int ( *FS_ReadFile )( const char *qpath, void **buffer, qboolean quiet );
long ( *FS_ReadFile )( const char *qpath, void **buffer, qboolean quiet );
void ( *FS_FreeFile )( void *buffer );
int ( *FS_WriteFile )( const char *qpath, const void *buffer, int size );
fileHandle_t ( *FS_FOpenFileWrite )( const char *fileName );

1
code/libmad-0.15.1b/CMakeLists.txt
View file

@ -17,3 +17,4 @@ set(SRCS
add_library(libmad STATIC ${SRCS})
target_compile_definitions(libmad PUBLIC FPM_64BIT)
target_compile_definitions(libmad PUBLIC NDEBUG) # otherwise assert() will call abort() and it fails to compile on clang-16 (call to undeclared library function 'abort')

2
code/qcommon/cmd.c
View file

@ -1082,7 +1082,7 @@ void Cmd_List_f (void)
Cmd_CompleteCfgName
==================
*/
void Cmd_CompleteCfgName( char *args, int argNum ) {
void Cmd_CompleteCfgName( const char *args, int argNum ) {
if( argNum == 2 ) {
Field_CompleteFilename( "", "cfg", qfalse, qtrue );
}

5
code/qcommon/qcommon.h
View file

@ -497,7 +497,7 @@ void Cmd_AddCommand( const char *cmd_name, xcommand_t function );
void Cmd_RemoveCommand( const char *cmd_name );
typedef void (*completionFunc_t)( char *args, int argNum );
typedef void (*completionFunc_t)( const char *args, int argNum );
// don't allow VMs to remove system commands
void Cmd_RemoveCommandSafe( const char *cmd_name );
@ -507,7 +507,7 @@ void Cmd_CommandCompletion( void(*callback)(const char *s) );
void Cmd_SetCommandCompletionFunc( const char *command,
completionFunc_t complete );
void Cmd_CompleteArgument( const char *command, char *args, int argNum );
void Cmd_CompleteCfgName( char *args, int argNum );
void Cmd_CompleteCfgName( const char *args, int argNum );
void Cmd_CommandCompletion( void(*callback)(const char *s) );
const char* Cmd_CompleteCommandByNumber(const char* partial, int number);
// callback with each valid string
@ -933,6 +933,7 @@ int Com_Filter(const char *filter, const char *name, int casesensitive);
int Com_FilterPath(const char *filter, const char *name, int casesensitive);
int Com_RealTime(qtime_t *qtime);
qboolean Com_SafeMode( void );
void Com_RunAndTimeServerPacket(netadr_t *evFrom, msg_t *buf);
void Com_StartupVariable( const char *match );
// checks for and removes command line "+set var arg" constructs

3
code/renderer/tr_local.h
View file

@ -2117,6 +2117,7 @@ TERRAIN
*/
void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
void R_AddTerrainSurfaces();
void R_AddTerrainMarkSurfaces();
void R_InitTerrain();
void R_TerrainPrepareFrame();
qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
@ -2363,6 +2364,8 @@ extern volatile qboolean renderThreadActive;
void *R_GetCommandBuffer( int bytes );
void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
void R_AddSpriteSurfCmd( drawSurf_t* drawSurfs, int numDrawSurfs );
void RB_ExecuteRenderCommands( const void *data );
void R_SavePerformanceCounters(void);

2
code/renderercommon/tr_public.h
View file

@ -130,7 +130,7 @@ typedef struct {
void (*DrawStretchPic2)(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
void (*DrawTilePic)(float x, float y, float w, float h, qhandle_t hShader);
void (*DrawTilePicOffset)(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
void (*DrawTrianglePic)(vec2_t* points, vec2_t* texCoords, qhandle_t hShader);
void (*DrawTrianglePic)(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
void (*DrawBackground)(int cols, int rows, int bgr, uint8_t* data);
void (*DebugLine)(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);