Merge remote-tracking branch 'yquake2/master'

This commit is contained in:
Denis Pauk 2024-07-06 14:27:25 +03:00
commit 4c9a04efc5
4 changed files with 2764 additions and 4 deletions

View File

@ -402,7 +402,8 @@ Sys_UnloadGame(void)
void * void *
Sys_GetGameAPI(void *parms) Sys_GetGameAPI(void *parms)
{ {
void *(*GetGameAPI)(void *); typedef void *(*fnAPI)(void *);
fnAPI GetGameAPI;
char name[MAX_OSPATH]; char name[MAX_OSPATH];
char *path; char *path;
@ -479,7 +480,7 @@ Sys_GetGameAPI(void *parms)
} }
} }
GetGameAPI = (void *)dlsym(game_library, "GetGameAPI"); GetGameAPI = (fnAPI)dlsym(game_library, "GetGameAPI");
if (!GetGameAPI) if (!GetGameAPI)
{ {

View File

@ -547,7 +547,7 @@ CL_DownloadFileName(char *dest, int destlen, char *fn)
static qboolean static qboolean
CL_DownloadFilter(const char *filename) CL_DownloadFilter(const char *filename)
{ {
if (FS_LoadFile( (char *) filename, NULL) != -1) if (FS_LoadFile((char *) filename, NULL) != -1)
{ {
/* it exists, no need to download */ /* it exists, no need to download */
return true; return true;

View File

@ -67,8 +67,8 @@ int crosshair_width, crosshair_height;
extern cvar_t *cl_showfps; extern cvar_t *cl_showfps;
extern cvar_t *crosshair_scale; extern cvar_t *crosshair_scale;
extern cvar_t *cl_showspeed; extern cvar_t *cl_showspeed;
extern float GetPlayerSpeed(float *, float *);
float GetPlayerSpeed(float* speed, float* speedxy);
void SCR_TimeRefresh_f(void); void SCR_TimeRefresh_f(void);
void SCR_Loading_f(void); void SCR_Loading_f(void);

File diff suppressed because it is too large Load Diff