eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

fix some warnings. d3d8 renderer builds with cygwin's mingw.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5076 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-03-21 17:51:34 +00:00
parent f80cafc6fa
commit 1946cdc694
6 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
engine/Makefile
View file

@ -574,7 +574,6 @@ GLQUAKE_OBJS = \
D3DQUAKE_OBJS = \ D3DQUAKE_OBJS = \
d3d8_backend.o \ d3d8_backend.o \
d3d8_image.o \ d3d8_image.o \
d3d8_shader.o \
vid_d3d8.o \ vid_d3d8.o \
d3d_backend.o \ d3d_backend.o \
d3d_image.o \ d3d_image.o \

2
engine/client/m_download.c
View file

@ -2596,7 +2596,7 @@ void PM_Command_f(void)
unsigned int changes = PM_MarkUpdates(); unsigned int changes = PM_MarkUpdates();
if (changes) if (changes)
{ {
Con_Printf("%u packages flagged\n"); Con_Printf("%u packages flagged\n", changes);
PM_PromptApplyChanges(); PM_PromptApplyChanges();
} }
else else

29
engine/client/pr_menu.c
View file

@ -853,31 +853,6 @@ void QCBUILTIN PF_CL_drawline (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
int flags = prinst->callargc >= 6?G_FLOAT(OFS_PARM5):0; int flags = prinst->callargc >= 6?G_FLOAT(OFS_PARM5):0;
shader_t *shader_draw_line; shader_t *shader_draw_line;
mesh_t mesh;
vecV_t vpos[2];
vec2_t vst[2];
vec4_t vcol[2];
index_t idx[2];
memset(&mesh, 0, sizeof(mesh));
mesh.indexes = idx;
mesh.xyz_array = vpos;
mesh.st_array = vst;
mesh.colors4f_array[0] = vcol;
VectorCopy(point1, vpos[0]);
Vector2Set(vst[0], 0, 0);
Vector4Set(vcol[0], rgb[0], rgb[1], rgb[2], alpha);
VectorCopy(point2, vpos[1]);
Vector2Set(vst[1], 0, 0);
Vector4Set(vcol[1], rgb[0], rgb[1], rgb[2], alpha);
mesh.numvertexes = 2;
mesh.indexes[0] = 0;
mesh.indexes[1] = 1;
mesh.numindexes = 2;
//this shader lookup might get pricy. //this shader lookup might get pricy.
shader_draw_line = R_RegisterShader("shader_draw_line", SUF_NONE, shader_draw_line = R_RegisterShader("shader_draw_line", SUF_NONE,
"{\n" "{\n"
@ -890,11 +865,11 @@ void QCBUILTIN PF_CL_drawline (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
"}\n" "}\n"
"}\n"); "}\n");
r2d_be_flags = PF_SelectDPDrawFlag(flags);
R2D_ImageColours(rgb[0], rgb[1], rgb[2], alpha); R2D_ImageColours(rgb[0], rgb[1], rgb[2], alpha);
R2D_Line(point1[0], point1[1], point2[0], point2[1], shader_draw_line); R2D_Line(point1[0], point1[1], point2[0], point2[1], shader_draw_line);
R2D_ImageColours(1,1,1,1); R2D_ImageColours(1,1,1,1);
r2d_be_flags = 0;
// BE_DrawMesh_Single(shader_draw_line, &mesh, NULL, flags|BEF_LINES);
} }
//vector drawgetimagesize(string pic) = #460; //vector drawgetimagesize(string pic) = #460;

3
engine/d3d/vid_d3d8.c
View file

@ -15,6 +15,9 @@
#endif #endif
#include <d3d8.h> #include <d3d8.h>
#ifndef D3DSGR_NO_CALIBRATION
#define D3DSGR_NO_CALIBRATION 0 //mingw fails to define this.
#endif
/*Fixup outdated windows headers*/ /*Fixup outdated windows headers*/
#ifndef WM_XBUTTONDOWN #ifndef WM_XBUTTONDOWN

2
engine/server/sv_mvd.c
View file

@ -2515,7 +2515,7 @@ void SV_UserCmdMVDList_f (void)
} }
if (host_client->num_backbuf == MAX_BACK_BUFFERS) if (host_client->num_backbuf == MAX_BACK_BUFFERS)
SV_ClientPrintf(host_client, PRINT_HIGH, "*MORE*\n", i, list->name, list->size/1024); SV_ClientPrintf(host_client, PRINT_HIGH, "*MORE*\n");
} }
for (d = demo.dest; d; d = d->nextdest) for (d = demo.dest; d; d = d->nextdest)

2
engine/server/sv_user.c
View file

@ -4132,7 +4132,6 @@ Allow clients to change userinfo
*/ */
void SV_SetInfo_f (void) void SV_SetInfo_f (void)
{ {
int i;
char oldval[MAX_INFO_KEY]; char oldval[MAX_INFO_KEY];
char *key, *val; char *key, *val;
@ -4193,7 +4192,6 @@ void SV_SetInfo_f (void)
if (*key != '_') if (*key != '_')
{ {
i = host_client - svs.clients;
val = Info_ValueForKey(host_client->userinfo, key); val = Info_ValueForKey(host_client->userinfo, key);
SV_BroadcastUserinfoChange(host_client, SV_UserInfoIsBasic(key), key, val); SV_BroadcastUserinfoChange(host_client, SV_UserInfoIsBasic(key), key, val);