From 3f42114b7c39aa725ee71230e8434acc79be74c2 Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 19 Aug 2006 04:25:06 +0000 Subject: [PATCH] patch from div to fix icc warnings git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6560 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rmain.c | 2 +- libcurl.c | 4 ++-- menu.c | 4 ++-- prvm_edict.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gl_rmain.c b/gl_rmain.c index 02898d9d..596f9c36 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -2308,7 +2308,7 @@ void R_Mesh_AddBrushMeshFromPlanes(rmesh_t *mesh, int numplanes, mplane_t *plane { w = 0; tempnumpoints = 4; - PolygonD_QuadForPlane(temppoints[w], plane->normal[0], plane->normal[1], plane->normal[2], plane->normal[3], maxdist); + PolygonD_QuadForPlane(temppoints[w], plane->normal[0], plane->normal[1], plane->normal[2], plane->dist, maxdist); for (planenum2 = 0, plane2 = planes;planenum2 < numplanes && tempnumpoints >= 3;planenum2++, plane2++) { if (planenum2 == planenum) diff --git a/libcurl.c b/libcurl.c index 1aa40f63..42c407ff 100644 --- a/libcurl.c +++ b/libcurl.c @@ -274,7 +274,7 @@ static void Curl_CheckCommandWhenDone() Cbuf_AddText("\n"); Cbuf_AddText(command_when_done); Cbuf_AddText("\n"); - Curl_Clear_forthismap(NULL); + Curl_Clear_forthismap(); } else if(numdownloads_added && numdownloads_fail && *command_when_error) { @@ -282,7 +282,7 @@ static void Curl_CheckCommandWhenDone() Cbuf_AddText("\n"); Cbuf_AddText(command_when_error); Cbuf_AddText("\n"); - Curl_Clear_forthismap(NULL); + Curl_Clear_forthismap(); } } diff --git a/menu.c b/menu.c index e970291b..b59b39a2 100644 --- a/menu.c +++ b/menu.c @@ -3298,7 +3298,7 @@ void M_Menu_LanConfig_f (void) if (StartingGame) lanConfig_cursor = 1; lanConfig_port = 26000; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); M_Update_Return_Reason(""); } @@ -3464,7 +3464,7 @@ static void M_LanConfig_Key (int key, char ascii) l = atoi(lanConfig_portname); if (l <= 65535) lanConfig_port = l; - sprintf(lanConfig_portname, "%u", lanConfig_port); + sprintf(lanConfig_portname, "%u", (unsigned int) lanConfig_port); } //============================================================================= diff --git a/prvm_edict.c b/prvm_edict.c index 98b1b982..17c625f1 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -422,7 +422,7 @@ char *PRVM_ValueString (etype_t type, prvm_eval_t *val) sprintf (line, "pointer"); break; default: - sprintf (line, "bad type %i", type); + sprintf (line, "bad type %i", (int) type); break; } -- 2.39.2