From 74a2a05ec2671f20207f8f202bdcb916a7fa5b72 Mon Sep 17 00:00:00 2001 From: plagman Date: Tue, 25 Mar 2008 09:21:18 +0000 Subject: [PATCH] Kill warnings. git-svn-id: https://svn.eduke32.com/eduke32@659 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/include/polymer.h | 2 +- polymer/build/src/engine.c | 2 +- polymer/build/src/polymer.c | 34 +++++++++++++++++++++------------ polymer/build/src/sdlayer.c | 7 +++++-- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/polymer/build/include/polymer.h b/polymer/build/include/polymer.h index 883769682..4b547c858 100644 --- a/polymer/build/include/polymer.h +++ b/polymer/build/include/polymer.h @@ -86,7 +86,7 @@ extern int updatesectors; int polymer_init(void); void polymer_glinit(void); void polymer_loadboard(void); -void polymer_drawrooms(int daposx, int daposy, int daposz, short daang, int dahoriz, short dacursectnum, int root); +void polymer_drawrooms(int daposx, int daposy, int daposz, short daang, int dahoriz, short dacursectnum); void polymer_rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, char dapalnum, char dastat, int cx1, int cy1, int cx2, int cy2); void polymer_drawmaskwall(int damaskwallcnt); void polymer_drawsprite(int snum); diff --git a/polymer/build/src/engine.c b/polymer/build/src/engine.c index f6e5f7e20..a40dfae74 100644 --- a/polymer/build/src/engine.c +++ b/polymer/build/src/engine.c @@ -5827,7 +5827,7 @@ void drawrooms(int daposx, int daposy, int daposz, if (rendmode == 4) { polymer_glinit(); - polymer_drawrooms(daposx, daposy, daposz, daang, dahoriz, dacursectnum, 1); + polymer_drawrooms(daposx, daposy, daposz, daang, dahoriz, dacursectnum); bglDisable(GL_SCISSOR_TEST); bglDisable(GL_CULL_FACE); return; diff --git a/polymer/build/src/polymer.c b/polymer/build/src/polymer.c index 97c0dcbae..de0adfdb7 100644 --- a/polymer/build/src/polymer.c +++ b/polymer/build/src/polymer.c @@ -204,14 +204,11 @@ void polymer_loadboard(void) if (pr_verbosity >= 1) OSD_Printf("PR : Board loaded.\n"); } -void polymer_drawrooms(int daposx, int daposy, int daposz, short daang, int dahoriz, short dacursectnum, int root) +void polymer_drawrooms(int daposx, int daposy, int daposz, short daang, int dahoriz, short dacursectnum) { - int i, j; + int i; float ang, horizang, tiltang; - _point2d ref; - sectortype *sec; - walltype *wal; - short drawnsectors, fov; + short fov; if (pr_verbosity >= 3) OSD_Printf("PR : Drawing rooms...\n"); @@ -319,6 +316,18 @@ void polymer_drawrooms(int daposx, int daposy, int daposz, short void polymer_rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, char dapalnum, char dastat, int cx1, int cy1, int cx2, int cy2) { + UNREFERENCED_PARAMETER(sx); + UNREFERENCED_PARAMETER(sy); + UNREFERENCED_PARAMETER(z); + UNREFERENCED_PARAMETER(a); + UNREFERENCED_PARAMETER(picnum); + UNREFERENCED_PARAMETER(dashade); + UNREFERENCED_PARAMETER(dapalnum); + UNREFERENCED_PARAMETER(dastat); + UNREFERENCED_PARAMETER(cx1); + UNREFERENCED_PARAMETER(cy1); + UNREFERENCED_PARAMETER(cx2); + UNREFERENCED_PARAMETER(cy2); } void polymer_drawmaskwall(int damaskwallcnt) @@ -336,7 +345,6 @@ int polymer_initsector(short sectnum) { sectortype *sec; _prsector* s; - int i; if (pr_verbosity >= 2) OSD_Printf("PR : Initalizing sector %i...\n", sectnum); @@ -533,6 +541,9 @@ void PR_CALLBACK polymer_tesscombine(GLdouble v[3], GLdouble *data[4], GLfloa // This callback is called by the tesselator when it detects an intersection between contours (HELLO ROTATING SPOTLIGHT IN E1L1). GLdouble* ptr; + UNREFERENCED_PARAMETER(data); + UNREFERENCED_PARAMETER(weight); + tempvertice[0] = v[0]; tempvertice[1] = v[1]; tempvertice[2] = v[2]; @@ -554,6 +565,7 @@ void PR_CALLBACK polymer_tesserror(GLenum error) void PR_CALLBACK polymer_tessedgeflag(GLenum error) { // Passing an edgeflag callback forces the tesselator to output a triangle list + UNREFERENCED_PARAMETER(error); return; } @@ -637,11 +649,9 @@ int polymer_buildfloor(short sectnum) void polymer_drawsector(short sectnum) { - sectortype *sec, *nextsec; + sectortype *sec; walltype *wal; _prsector* s; - int i; - int zdiff; if (pr_verbosity >= 3) OSD_Printf("PR : Drawing sector %i...\n", sectnum); @@ -725,7 +735,7 @@ void polymer_updatewall(short wallnum) _prwall *w; _prsector *s, *ns; pthtyp* pth; - int xref, yref, xdif, ydif; + int xref, yref; float ypancoef, dist; int i; @@ -1320,7 +1330,7 @@ int polymer_portalinfrustum(short wallnum) float polymer_pointdistancetoplane(GLfloat* point, GLfloat* plane) { - float result, t; + float result; result = plane[0] * point[0] + plane[1] * point[1] + diff --git a/polymer/build/src/sdlayer.c b/polymer/build/src/sdlayer.c index 33726517b..a8a8ad6cf 100644 --- a/polymer/build/src/sdlayer.c +++ b/polymer/build/src/sdlayer.c @@ -30,7 +30,7 @@ int startwin_open(void) { return 0; } int startwin_close(void) { return 0; } int startwin_puts(const char *s) { s=s; return 0; } -int startwin_idle(void *s) { return 0; } +int startwin_idle(void *s) { s=s; return 0; } int startwin_settitle(const char *s) { s=s; return 0; } #endif @@ -94,6 +94,8 @@ int wm_msgbox(char *name, char *fmt, ...) char buf[2048]; va_list va; + UNREFERENCED_PARAMETER(name); + va_start(va,fmt); vsprintf(buf,fmt,va); va_end(va); @@ -115,7 +117,8 @@ int wm_ynbox(char *name, char *fmt, ...) char buf[2048]; char c; va_list va; - int r; + + UNREFERENCED_PARAMETER(name); va_start(va,fmt); vsprintf(buf,fmt,va);