mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2025-02-07 16:31:30 +00:00
Merge remote-tracking branch 'yquake2/master'
This commit is contained in:
commit
4c9a04efc5
4 changed files with 2764 additions and 4 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
||||||
|
|
2759
stuff/mapfixes/juggernaut/jug13.ent
Normal file
2759
stuff/mapfixes/juggernaut/jug13.ent
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue