patch from div to fix icc warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6560 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_rmain.c b/gl_rmain.c
index 02898d9de2007e0120da2fe7c94e372485079954..596f9c36191bd8edbca46c40934465889f3885fa 100644 (file)
--- 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 1aa40f6382c08e30d1da1bf6fb40ecf2d975ce0a..42c407ff4d4a3ff8d74817588e8877f09a6e6850 100644 (file)
--- 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 e970291bff259f9aec806880d1d7940ad1159146..b59b39a2c79f6bcc16c12ab95c5ad4b403e96a61 100644 (file)
--- 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 98b1b9824581801779914fc5e388a1537ead9832..17c625f10de68dbcf2fc1fa2ee7da97a97123631 100644 (file)
--- 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;
        }