yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #253 from 0lvin/sdl_build_fix 

Fix build with SDL1.2
This commit is contained in:
Yamagi 2017-11-07 10:32:52 +01:00 committed by GitHub
parent 1396741904 9495fe4da9
commit 82616d0992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/sdl/input.c
View File

@ -1290,6 +1290,7 @@ IN_Init(void)
Com_Printf("------------------------------------\n\n");
}
#if SDL_VERSION_ATLEAST(2, 0, 0)
/*
* Shuts the backend down
*/
@ -1304,6 +1305,7 @@ IN_Haptic_Shutdown(void)
joystick_haptic = NULL;
}
}
#endif
void
IN_Shutdown(void)

24
src/common/collision.c
View File

@ -119,7 +119,7 @@ vec3_t trace_extents;
int c_pointcontents;
int c_traces, c_brush_traces;
#endif
/* 1/32 epsilon to keep floating point happy */
#define DIST_EPSILON (0.03125f)
@ -738,7 +738,7 @@ CM_ClipBoxToBrush(vec3_t mins, vec3_t maxs, vec3_t p1,
}
void
CM_TestBoxInBrush(vec3_t mins, vec3_t maxs, vec3_t p1,
CM_TestBoxInBrush(vec3_t mins, vec3_t maxs, vec3_t p1,
trace_t *trace, cbrush_t *brush)
{
int i, j;
@ -1186,7 +1186,7 @@ CMod_LoadSubmodels(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadSubmodels: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1230,7 +1230,7 @@ CMod_LoadSurfaces(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadSurfaces: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1269,7 +1269,7 @@ CMod_LoadNodes(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadNodes: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1311,7 +1311,7 @@ CMod_LoadBrushes(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadBrushes: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1345,7 +1345,7 @@ CMod_LoadLeafs(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadLeafs: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1415,7 +1415,7 @@ CMod_LoadPlanes(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadPlanes: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1466,7 +1466,7 @@ CMod_LoadLeafBrushes(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadLeafBrushes: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1504,7 +1504,7 @@ CMod_LoadBrushSides(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadBrushSides: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1545,7 +1545,7 @@ CMod_LoadAreas(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadAreas: funny lump size");
}
count = l->filelen / sizeof(*in);
@ -1578,7 +1578,7 @@ CMod_LoadAreaPortals(lump_t *l)
if (l->filelen % sizeof(*in))
{
Com_Error(ERR_DROP, "MOD_LoadBmodel: funny lump size");
Com_Error(ERR_DROP, "Mod_LoadAreaPortals: funny lump size");
}
count = l->filelen / sizeof(*in);

4
src/common/header/shared.h
View File

@ -457,8 +457,8 @@ typedef struct cmodel_s
typedef struct csurface_s
{
char name[16];
int flags;
int value;
int flags; /* SURF_* */
int value; /* unused */
} csurface_t;
typedef struct mapsurface_s /* used internally due to name len probs */