qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-25 22:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[build] Fix some windows bitrot

Browse source
This commit is contained in:
Bill Currie 2021-08-02 14:02:41 +09:00
parent d99fb01b65
commit ec54c54226
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/video/renderer/glsl/glsl_bsp.c
View file

@ -581,7 +581,7 @@ glsl_R_BuildDisplayLists (model_t **models, int num_models)
glsltex_t *tex; glsltex_t *tex;
if (j == dm->firstface + dm->numfaces) { if (j == dm->firstface + dm->numfaces) {
dm++; dm++;
if (dm - brush->submodels == brush->numsubmodels) { if (dm == brush->submodels + brush->numsubmodels) {
// limit the surfaces // limit the surfaces
// probably never hit // probably never hit
Sys_Printf ("R_BuildDisplayLists: too many surfaces\n"); Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");

2
libs/video/renderer/vulkan/vulkan_bsp.c
View file

@ -426,7 +426,7 @@ Vulkan_BuildDisplayLists (model_t **models, int num_models, vulkan_ctx_t *ctx)
if (j == dm->firstface + dm->numfaces) { if (j == dm->firstface + dm->numfaces) {
// move on to the next sub-model // move on to the next sub-model
dm++; dm++;
if (dm - brush->submodels == brush->numsubmodels) { if (dm == brush->submodels + brush->numsubmodels) {
// limit the surfaces // limit the surfaces
// probably never hit // probably never hit
Sys_Printf ("R_BuildDisplayLists: too many surfaces\n"); Sys_Printf ("R_BuildDisplayLists: too many surfaces\n");

4
libs/video/targets/in_sdl.c
View file

@ -71,7 +71,7 @@ event_focusin (void)
} }
static void static void
sdl_keydest_callback (keydest_t key_dest) sdl_keydest_callback (keydest_t key_dest, void *data)
{ {
if (key_dest == key_game) if (key_dest == key_game)
SDL_EnableKeyRepeat (0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableKeyRepeat (0, SDL_DEFAULT_REPEAT_INTERVAL);
@ -588,7 +588,7 @@ IN_LL_Init (void)
{ {
SDL_EnableUNICODE (1); // Enable UNICODE translation for keyboard input SDL_EnableUNICODE (1); // Enable UNICODE translation for keyboard input
Key_KeydestCallback (sdl_keydest_callback); Key_KeydestCallback (sdl_keydest_callback, 0);
if (COM_CheckParm ("-nomouse")) if (COM_CheckParm ("-nomouse"))
return; return;

4
libs/video/targets/in_win.c
View file

@ -348,7 +348,7 @@ in_paste_buffer_f (void)
} }
static void static void
win_keydest_callback (keydest_t key_dest) win_keydest_callback (keydest_t key_dest, void *data)
{ {
win_in_game = key_dest == key_game; win_in_game = key_dest == key_game;
if (win_in_game) { if (win_in_game) {
@ -367,7 +367,7 @@ IN_LL_Init (void)
IN_StartupMouse (); IN_StartupMouse ();
Key_KeydestCallback (win_keydest_callback); Key_KeydestCallback (win_keydest_callback, 0);
Cmd_AddCommand ("in_paste_buffer", in_paste_buffer_f, Cmd_AddCommand ("in_paste_buffer", in_paste_buffer_f,
"Paste the contents of the C&P buffer to the console"); "Paste the contents of the C&P buffer to the console");
} }

10
tools/bsp2img/bsp2img.c
View file

@ -73,8 +73,8 @@ Thanks fly to Id for a hackable game! :)
/* MW */ /* MW */
typedef struct edge_extra_t { typedef struct edge_extra_t {
long num_face_ref; uint32_t num_face_ref;
long ref_faces[MAX_REF_FACES]; // which faces are referenced uint32_t ref_faces[MAX_REF_FACES]; // which faces are referenced
dvertex_t ref_faces_normal[MAX_REF_FACES]; // normal of referenced dvertex_t ref_faces_normal[MAX_REF_FACES]; // normal of referenced
// faces // faces
int ref_faces_area[MAX_REF_FACES]; // area of the referenced faces int ref_faces_area[MAX_REF_FACES]; // area of the referenced faces
@ -531,7 +531,7 @@ create_image (long width, long height)
static image_t * static image_t *
render_map (bsp_t *bsp) render_map (bsp_t *bsp)
{ {
long j = 0, k = 0, x = 0; uint32_t j = 0, k = 0, x = 0;
dvertex_t *vertexlist, *vert1, *vert2; dvertex_t *vertexlist, *vert1, *vert2;
dedge_t *edgelist; dedge_t *edgelist;
@ -563,7 +563,7 @@ render_map (bsp_t *bsp)
edge_extra = malloc (sizeof (struct edge_extra_t) * bsp->numedges); edge_extra = malloc (sizeof (struct edge_extra_t) * bsp->numedges);
if (edge_extra == NULL) { if (edge_extra == NULL) {
fprintf (stderr, "Error allocating %ld bytes for extra edge info.", fprintf (stderr, "Error allocating %ld bytes for extra edge info.",
(long) sizeof (struct edge_extra_t) * bsp->numedges); (long) (sizeof (struct edge_extra_t) * bsp->numedges));
exit (2); exit (2);
} }
/* initialize the array */ /* initialize the array */
@ -842,7 +842,7 @@ render_map (bsp_t *bsp)
} }
printf ("%zd edges plotted", bsp->numedges); printf ("%zd edges plotted", bsp->numedges);
if (options.edgeremove) { if (options.edgeremove) {
printf (" (%ld edges removed)\n", k); printf (" (%u edges removed)\n", k);
} else { } else {
printf ("\n"); printf ("\n");
} }

2
tools/qfvis/source/base-vis.c
View file

@ -132,7 +132,7 @@ PortalBase (basethread_t *thread, portal_t *portal)
cluster_t *cluster; cluster_t *cluster;
int tp_side, portal_side; int tp_side, portal_side;
for (cluster = clusters; cluster - clusters < portalclusters; cluster++) { for (cluster = clusters; cluster < clusters + portalclusters; cluster++) {
int side = test_sphere (&cluster->sphere, portal->plane); int side = test_sphere (&cluster->sphere, portal->plane);
if (side < 0) { if (side < 0) {