git-svn-id: https://svn.eduke32.com/eduke32@655 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-03-23 00:06:42 +00:00
parent 408ca47fbd
commit 546e361166
11 changed files with 76 additions and 31 deletions

View file

@ -64,7 +64,6 @@ static int osdfunc_setrendermode(const osdfuncparm_t *parm)
static int osdcmd_hicsetpalettetint(const osdfuncparm_t *parm) static int osdcmd_hicsetpalettetint(const osdfuncparm_t *parm)
{ {
int pal, cols[3], eff; int pal, cols[3], eff;
char *p;
if (parm->numparms != 5) return OSDCMD_SHOWHELP; if (parm->numparms != 5) return OSDCMD_SHOWHELP;

View file

@ -135,7 +135,7 @@ static int repeatcountx, repeatcounty;
static int fillist[640]; static int fillist[640];
int mousx, mousy; int mousx, mousy;
/*
static char scantoasc[128] = static char scantoasc[128] =
{ {
0,0,'1','2','3','4','5','6','7','8','9','0','-','=',0,0, 0,0,'1','2','3','4','5','6','7','8','9','0','-','=',0,0,
@ -158,8 +158,7 @@ static char scantoascwithshift[128] =
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
}; };
*/
char changechar(char dachar, int dadir, char smooshyalign, char boundcheck); char changechar(char dachar, int dadir, char smooshyalign, char boundcheck);
int adjustmark(int *xplc, int *yplc, short danumwalls); int adjustmark(int *xplc, int *yplc, short danumwalls);
@ -203,6 +202,8 @@ static int osdcmd_restartvid(const osdfuncparm_t *parm)
{ {
extern int qsetmode; extern int qsetmode;
UNREFERENCED_PARAMETER(parm);
if (qsetmode != 200) return OSDCMD_OK; if (qsetmode != 200) return OSDCMD_OK;
resetvideomode(); resetvideomode();
@ -270,7 +271,7 @@ extern char *defsfilename; // set in bstub.c
int app_main(int argc, const char **argv) int app_main(int argc, const char **argv)
{ {
char ch, quitflag, cmdsetup = 0; char quitflag, cmdsetup = 0;
int i, j, k; int i, j, k;
pathsearchmode = 1; // unrestrict findfrompath so that full access to the filesystem can be had pathsearchmode = 1; // unrestrict findfrompath so that full access to the filesystem can be had
@ -566,10 +567,10 @@ void loadmhk()
void editinput(void) void editinput(void)
{ {
char smooshyalign, repeatpanalign, *ptr, buffer[80]; char smooshyalign, repeatpanalign, buffer[80];
short sectnum, nextsectnum, startwall, endwall, dasector, daang; short /*sectnum, nextsectnum,*/ startwall, endwall, dasector, daang;
int mousz, bstatus; int mousz, bstatus;
int i, j, k, cnt, tempint=0, doubvel, changedir, wallfind[2], daz[2]; int i, j, k, /*cnt,*/ tempint=0, doubvel, changedir/*, wallfind[2], daz[2]*/;
int dashade[2], goalz, xvect, yvect, hiz, loz; int dashade[2], goalz, xvect, yvect, hiz, loz;
short hitsect, hitwall, hitsprite; short hitsect, hitwall, hitsprite;
int hitx, hity, hitz, dax, day, hihit, lohit; int hitx, hity, hitz, dax, day, hihit, lohit;
@ -6515,7 +6516,7 @@ int numloopsofsector(short sectnum)
int getnumber16(char namestart[80], int num, int maxnumber, char sign) int getnumber16(char namestart[80], int num, int maxnumber, char sign)
{ {
char buffer[80], ch; char buffer[80], ch;
int j, k, n, danum, oldnum; int n, danum, oldnum;
danum = (int)num; danum = (int)num;
oldnum = danum; oldnum = danum;
@ -6569,7 +6570,7 @@ int getnumber16(char namestart[80], int num, int maxnumber, char sign)
int getnumber256(char namestart[80], int num, int maxnumber, char sign) int getnumber256(char namestart[80], int num, int maxnumber, char sign)
{ {
char buffer[80], ch; char buffer[80], ch;
int j, k, n, danum, oldnum; int n, danum, oldnum;
danum = num; danum = num;
oldnum = danum; oldnum = danum;
@ -6657,8 +6658,8 @@ int getfilenames(char *path, char *kind)
int menuselect(void) int menuselect(void)
{ {
int listsize; int listsize;
int i, j, topplc; int i;
char ch, buffer[78], *sb; char ch, buffer[78];
static char oldpath[BMAX_PATH]; static char oldpath[BMAX_PATH];
CACHE1D_FIND_REC *dir; CACHE1D_FIND_REC *dir;
@ -7473,7 +7474,6 @@ void showspritedata(short spritenum)
void keytimerstuff(void) void keytimerstuff(void)
{ {
static int ltotalclock=0; static int ltotalclock=0;
int i;
if (totalclock == ltotalclock) return; if (totalclock == ltotalclock) return;
ltotalclock=totalclock; ltotalclock=totalclock;

View file

@ -5537,6 +5537,7 @@ static int raytrace(int x3, int y3, int *x4, int *y4)
static void sighandler(int sig, const siginfo_t *info, void *ctx) static void sighandler(int sig, const siginfo_t *info, void *ctx)
{ {
const char *s; const char *s;
UNREFERENCED_PARAMETER(ctx);
switch (sig) switch (sig)
{ {
case SIGFPE: case SIGFPE:

View file

@ -189,6 +189,7 @@ static void * getproc_(const char *s, int *err, int fatal, int extension)
{ {
void *t; void *t;
#if defined RENDERTYPESDL #if defined RENDERTYPESDL
UNREFERENCED_PARAMETER(extension);
t = (void*)SDL_GL_GetProcAddress(s); t = (void*)SDL_GL_GetProcAddress(s);
#elif defined _WIN32 #elif defined _WIN32
if (extension) t = (void*)bwglGetProcAddress(s); if (extension) t = (void*)bwglGetProcAddress(s);

View file

@ -85,6 +85,7 @@ void gtkbuild_init(int *argc, char ***argv)
void gtkbuild_exit(int r) void gtkbuild_exit(int r)
{ {
UNREFERENCED_PARAMETER(r);
if (gtkenabled) if (gtkenabled)
{ {
if (appicon) g_object_unref((gpointer)appicon); if (appicon) g_object_unref((gpointer)appicon);

View file

@ -59,8 +59,10 @@ static int GetTickCount(void)
int packetrate = PAKRATE; int packetrate = PAKRATE;
#define SIMMIS 0 //Release:0 Test:100 Packets per 256 missed. #define SIMMIS 0 //Release:0 Test:100 Packets per 256 missed.
#define SIMLAG 0 //Release:0 Test: 10 Packets to delay receipt #define SIMLAG 0 //Release:0 Test: 10 Packets to delay receipt
#if (SIMLAG != 0)
static int simlagcnt[MAXPLAYERS]; static int simlagcnt[MAXPLAYERS];
static char simlagfif[MAXPLAYERS][SIMLAG+1][MAXPAKSIZ+2]; static char simlagfif[MAXPLAYERS][SIMLAG+1][MAXPAKSIZ+2];
#endif
#if ((SIMMIS != 0) || (SIMLAG != 0)) #if ((SIMMIS != 0) || (SIMLAG != 0))
#pragma message("\n\nWARNING! INTENTIONAL PACKET LOSS SIMULATION IS ENABLED!\nREMEMBER TO CHANGE SIMMIS&SIMLAG to 0 before RELEASE!\n\n") #pragma message("\n\nWARNING! INTENTIONAL PACKET LOSS SIMULATION IS ENABLED!\nREMEMBER TO CHANGE SIMMIS&SIMLAG to 0 before RELEASE!\n\n")
#endif #endif
@ -169,7 +171,9 @@ int netinit(int portnum)
LPHOSTENT lpHostEnt; LPHOSTENT lpHostEnt;
char hostnam[256]; char hostnam[256];
struct sockaddr_in ip; struct sockaddr_in ip;
#ifdef __BEOS__
int i; int i;
#endif
#ifdef _WIN32 #ifdef _WIN32
if (wsainitialized == 0) if (wsainitialized == 0)
@ -323,10 +327,16 @@ int isvalidipaddress(char *st)
//---------------------------------- Obsolete variables&functions ---------------------------------- //---------------------------------- Obsolete variables&functions ----------------------------------
char syncstate = 0; char syncstate = 0;
void setpackettimeout(int datimeoutcount, int daresendagaincount) {} void setpackettimeout(int datimeoutcount, int daresendagaincount) { UNREFERENCED_PARAMETER(datimeoutcount); UNREFERENCED_PARAMETER(daresendagaincount); }
void genericmultifunction(int other, char *bufptr, int messleng, int command) {} void genericmultifunction(int other, char *bufptr, int messleng, int command)
{
UNREFERENCED_PARAMETER(other);
UNREFERENCED_PARAMETER(bufptr);
UNREFERENCED_PARAMETER(messleng);
UNREFERENCED_PARAMETER(command);
}
int getoutputcirclesize() { return(0); } int getoutputcirclesize() { return(0); }
void setsocket(int newsocket) { } void setsocket(int newsocket) { UNREFERENCED_PARAMETER(newsocket); }
void flushpackets() {} void flushpackets() {}
void sendlogon() {} void sendlogon() {}
void sendlogoff() {} void sendlogoff() {}
@ -506,7 +516,7 @@ int initmultiplayersparms(int argc, char **argv)
int initmultiplayerscycle(void) int initmultiplayerscycle(void)
{ {
int i, k; int i, k;
extern int totalclock; // extern int totalclock;
idle(); idle();
@ -550,11 +560,14 @@ int initmultiplayerscycle(void)
void initmultiplayers(int argc, char **argv, char damultioption, char dacomrateoption, char dapriority) void initmultiplayers(int argc, char **argv, char damultioption, char dacomrateoption, char dapriority)
{ {
int i, j, k, otims; UNREFERENCED_PARAMETER(damultioption);
UNREFERENCED_PARAMETER(dacomrateoption);
UNREFERENCED_PARAMETER(dapriority);
if (initmultiplayersparms(argc,argv)) if (initmultiplayersparms(argc,argv))
{ {
#if 0 #if 0
int i, j, k, otims;
//Console code seems to crash Win98 upon quitting game //Console code seems to crash Win98 upon quitting game
//it's not necessary and it's not portable anyway //it's not necessary and it's not portable anyway
char tbuf[1024]; char tbuf[1024];
@ -644,7 +657,7 @@ void dosendpackets(int other) //Host to send intially, client to send to others
void sendpacket(int other, char *bufptr, int messleng) void sendpacket(int other, char *bufptr, int messleng)
{ {
int i, j; // int i, j;
if (numplayers < 2) return; if (numplayers < 2) return;

View file

@ -22,12 +22,12 @@ static symbol_t *addnewsymbol(const char *name);
static symbol_t *findsymbol(const char *name, symbol_t *startingat); static symbol_t *findsymbol(const char *name, symbol_t *startingat);
static symbol_t *findexactsymbol(const char *name); static symbol_t *findexactsymbol(const char *name);
static int _validate_osdlines(void *); // static int _validate_osdlines(void *);
static int _internal_osdfunc_listsymbols(const osdfuncparm_t *); static int _internal_osdfunc_listsymbols(const osdfuncparm_t *);
static int _internal_osdfunc_help(const osdfuncparm_t *); static int _internal_osdfunc_help(const osdfuncparm_t *);
static int _internal_osdfunc_dumpbuildinfo(const osdfuncparm_t *); // static int _internal_osdfunc_dumpbuildinfo(const osdfuncparm_t *);
static int _internal_osdfunc_setrendermode(const osdfuncparm_t *); // static int _internal_osdfunc_setrendermode(const osdfuncparm_t *);
static int white=-1; // colour of white (used by default display routines) static int white=-1; // colour of white (used by default display routines)
static void _internal_drawosdchar(int, int, char, int, int); static void _internal_drawosdchar(int, int, char, int, int);
@ -99,8 +99,8 @@ static int osdeditshade=0;
static int osdeditpal=0; static int osdeditpal=0;
static int osdtextshade=0; static int osdtextshade=0;
static int osdtextpal=0; static int osdtextpal=0;
static int osdcursorshade=0; /* static int osdcursorshade=0;
static int osdcursorpal=0; static int osdcursorpal=0; */
// application callbacks // application callbacks
static void (*drawosdchar)(int, int, char, int, int) = _internal_drawosdchar; static void (*drawosdchar)(int, int, char, int, int) = _internal_drawosdchar;
@ -117,6 +117,9 @@ static void _internal_drawosdchar(int x, int y, char ch, int shade, int pal)
int i,j,k; int i,j,k;
char st[2] = { 0,0 }; char st[2] = { 0,0 };
UNREFERENCED_PARAMETER(shade);
UNREFERENCED_PARAMETER(pal);
st[0] = ch; st[0] = ch;
if (white<0) if (white<0)
@ -138,6 +141,9 @@ static void _internal_drawosdstr(int x, int y, char *ch, int len, int shade, int
int i,j,k; int i,j,k;
char st[1024]; char st[1024];
UNREFERENCED_PARAMETER(shade);
UNREFERENCED_PARAMETER(pal);
if (len>1023) len=1023; if (len>1023) len=1023;
memcpy(st,ch,len); memcpy(st,ch,len);
st[len]=0; st[len]=0;
@ -161,6 +167,8 @@ static void _internal_drawosdcursor(int x, int y, int type, int lastkeypress)
int i,j,k; int i,j,k;
char st[2] = { '_',0 }; char st[2] = { '_',0 };
UNREFERENCED_PARAMETER(lastkeypress);
if (type) st[0] = '#'; if (type) st[0] = '#';
if (white<0) if (white<0)
@ -189,6 +197,8 @@ static int _internal_getrowheight(int w)
static void _internal_clearbackground(int cols, int rows) static void _internal_clearbackground(int cols, int rows)
{ {
UNREFERENCED_PARAMETER(cols);
UNREFERENCED_PARAMETER(rows);
} }
static int _internal_gettime(void) static int _internal_gettime(void)
@ -198,6 +208,7 @@ static int _internal_gettime(void)
static void _internal_onshowosd(int a) static void _internal_onshowosd(int a)
{ {
UNREFERENCED_PARAMETER(a);
} }
//////////////////////////// ////////////////////////////
@ -232,6 +243,8 @@ static int _internal_osdfunc_listsymbols(const osdfuncparm_t *parm)
{ {
symbol_t *i; symbol_t *i;
UNREFERENCED_PARAMETER(parm);
OSD_Printf("Symbol listing:\n"); OSD_Printf("Symbol listing:\n");
for (i=symbols; i!=NULL; i=i->next) for (i=symbols; i!=NULL; i=i->next)
OSD_Printf(" %s\n", i->name); OSD_Printf(" %s\n", i->name);
@ -259,6 +272,7 @@ static int _internal_osdfunc_help(const osdfuncparm_t *parm)
static int _internal_osdfunc_clear(const osdfuncparm_t *parm) static int _internal_osdfunc_clear(const osdfuncparm_t *parm)
{ {
UNREFERENCED_PARAMETER(parm);
Bmemset(osdtext,0,sizeof(osdtext)); Bmemset(osdtext,0,sizeof(osdtext));
osdlines = 1; osdlines = 1;
return OSDCMD_OK; return OSDCMD_OK;

View file

@ -386,7 +386,6 @@ int scriptfile_getsymbolvalue(char *name, int *val)
int scriptfile_addsymbolvalue(char *name, int val) int scriptfile_addsymbolvalue(char *name, int val)
{ {
int x;
char *sp; char *sp;
// if (scriptfile_getsymbolvalue(name, &x)) return -1; // already exists // if (scriptfile_getsymbolvalue(name, &x)) return -1; // already exists

View file

@ -345,7 +345,7 @@ void debugprintf(const char *f, ...)
// //
static char mouseacquired=0,moustat=0; static char mouseacquired=0,moustat=0;
static int joyblast=0; // static int joyblast=0;
static SDL_Joystick *joydev = NULL; static SDL_Joystick *joydev = NULL;
// //
@ -549,7 +549,11 @@ void readmousebstatus(int *b)
// setjoydeadzone() -- sets the dead and saturation zones for the joystick // setjoydeadzone() -- sets the dead and saturation zones for the joystick
// //
void setjoydeadzone(int axis, unsigned short dead, unsigned short satur) void setjoydeadzone(int axis, unsigned short dead, unsigned short satur)
{} {
UNREFERENCED_PARAMETER(axis);
UNREFERENCED_PARAMETER(dead);
UNREFERENCED_PARAMETER(satur);
}
// //
@ -557,6 +561,7 @@ void setjoydeadzone(int axis, unsigned short dead, unsigned short satur)
// //
void getjoydeadzone(int axis, unsigned short *dead, unsigned short *satur) void getjoydeadzone(int axis, unsigned short *dead, unsigned short *satur)
{ {
UNREFERENCED_PARAMETER(axis);
*dead = *satur = 0; *dead = *satur = 0;
} }
@ -864,7 +869,7 @@ int checkvideomode(int *x, int *y, int c, int fs, int forced)
// //
int setvideomode(int x, int y, int c, int fs) int setvideomode(int x, int y, int c, int fs)
{ {
int modenum, regrab = 0; int regrab = 0;
static int warnonce = 0; static int warnonce = 0;
if ((fs == fullscreen) && (x == xres) && (y == yres) && (c == bpp) && if ((fs == fullscreen) && (x == xres) && (y == yres) && (c == bpp) &&
@ -1007,7 +1012,6 @@ int setvideomode(int x, int y, int c, int fs)
if (c > 8) if (c > 8)
{ {
char *p,*p2,*p3; char *p,*p2,*p3;
int i;
polymost_glreset(); polymost_glreset();
@ -1233,7 +1237,8 @@ void enddrawing(void)
// //
void showframe(int w) void showframe(int w)
{ {
int i,j; // int i,j;
UNREFERENCED_PARAMETER(w);
#ifdef USE_OPENGL #ifdef USE_OPENGL
if (bpp > 8) if (bpp > 8)

View file

@ -143,6 +143,7 @@ static void on_vmode2dcombo_changed(GtkComboBox *combobox, gpointer user_data)
GtkTreeModel *data; GtkTreeModel *data;
GtkTreeIter iter; GtkTreeIter iter;
int val; int val;
UNREFERENCED_PARAMETER(user_data);
if (!gtk_combo_box_get_active_iter(combobox, &iter)) return; if (!gtk_combo_box_get_active_iter(combobox, &iter)) return;
if (!(data = gtk_combo_box_get_model(combobox))) return; if (!(data = gtk_combo_box_get_model(combobox))) return;
gtk_tree_model_get(data, &iter, 1, &val, -1); gtk_tree_model_get(data, &iter, 1, &val, -1);
@ -155,6 +156,7 @@ static void on_vmode3dcombo_changed(GtkComboBox *combobox, gpointer user_data)
GtkTreeModel *data; GtkTreeModel *data;
GtkTreeIter iter; GtkTreeIter iter;
int val; int val;
UNREFERENCED_PARAMETER(user_data);
if (!gtk_combo_box_get_active_iter(combobox, &iter)) return; if (!gtk_combo_box_get_active_iter(combobox, &iter)) return;
if (!(data = gtk_combo_box_get_model(combobox))) return; if (!(data = gtk_combo_box_get_model(combobox))) return;
gtk_tree_model_get(data, &iter, 1, &val, -1); gtk_tree_model_get(data, &iter, 1, &val, -1);
@ -164,29 +166,38 @@ static void on_vmode3dcombo_changed(GtkComboBox *combobox, gpointer user_data)
static void on_fullscreencheck_toggled(GtkToggleButton *togglebutton, gpointer user_data) static void on_fullscreencheck_toggled(GtkToggleButton *togglebutton, gpointer user_data)
{ {
UNREFERENCED_PARAMETER(user_data);
settings.fullscreen = (gtk_toggle_button_get_active(togglebutton) == TRUE); settings.fullscreen = (gtk_toggle_button_get_active(togglebutton) == TRUE);
PopulateForm(); PopulateForm();
} }
static void on_alwaysshowcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data) static void on_alwaysshowcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data)
{ {
UNREFERENCED_PARAMETER(user_data);
settings.forcesetup = (gtk_toggle_button_get_active(togglebutton) == TRUE); settings.forcesetup = (gtk_toggle_button_get_active(togglebutton) == TRUE);
} }
static void on_cancelbutton_clicked(GtkButton *button, gpointer user_data) static void on_cancelbutton_clicked(GtkButton *button, gpointer user_data)
{ {
UNREFERENCED_PARAMETER(button);
UNREFERENCED_PARAMETER(user_data);
if (mode == TAB_CONFIG) { retval = 0; gtk_main_quit(); } if (mode == TAB_CONFIG) { retval = 0; gtk_main_quit(); }
else quitevent++; else quitevent++;
} }
static void on_startbutton_clicked(GtkButton *button, gpointer user_data) static void on_startbutton_clicked(GtkButton *button, gpointer user_data)
{ {
UNREFERENCED_PARAMETER(button);
UNREFERENCED_PARAMETER(user_data);
retval = 1; retval = 1;
gtk_main_quit(); gtk_main_quit();
} }
static gboolean on_startwin_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) static gboolean on_startwin_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data)
{ {
UNREFERENCED_PARAMETER(widget);
UNREFERENCED_PARAMETER(event);
UNREFERENCED_PARAMETER(user_data);
if (mode == TAB_CONFIG) { retval = 0; gtk_main_quit(); } if (mode == TAB_CONFIG) { retval = 0; gtk_main_quit(); }
else quitevent++; else quitevent++;
return TRUE; // FALSE would let the event go through. we want the game to decide when to close return TRUE; // FALSE would let the event go through. we want the game to decide when to close
@ -581,6 +592,7 @@ int startwin_settitle(const char *title)
int startwin_idle(void *s) int startwin_idle(void *s)
{ {
UNREFERENCED_PARAMETER(s);
if (!gtkenabled) return 0; if (!gtkenabled) return 0;
//if (!startwin) return 1; //if (!startwin) return 1;
gtk_main_iteration_do(FALSE); gtk_main_iteration_do(FALSE);

View file

@ -9221,7 +9221,7 @@ static void checkcommandline(int argc, const char **argv)
if (*c == '4') if (*c == '4')
{ {
movesperpacket = 4; movesperpacket = 4;
setpackettimeout(0x3fffffff,0x3fffffff); setpackettimeout(0x3fffffff,0x3fffffff); // this doesn't do anything anymore
} }
break; break;
case 'g': case 'g':