Subversion Repositories eduke32

Compare Revisions

Regard whitespace Rev 8660 → Rev 8664

/source/kenbuild/src/game.cpp
191,7 → 191,6
static signed char statrate[NUMSTATS] = {-1,0,-1,0,0,0,1,3,0,3,15,-1,-1};
 
//Input structures
static char networkmode; //0 is 2(n-1) mode, 1 is n(n-1) mode
static int locselectedgun, locselectedgun2;
static input loc, oloc, loc2;
static input ffsync[MAXPLAYERS], osync[MAXPLAYERS], ssync[MAXPLAYERS];
457,8 → 456,8
#if defined STARTUP_SETUP_WINDOW
int cmdsetup = 0;
#endif
int i, j, k /*, l, fil, waitplayers, x1, y1, x2, y2*/;
int /*other, packleng,*/ netparm;
int i, j, k /*, l, fil*/, waitplayers, x1, y1, x2, y2;
int other, /*packleng, */netparm;
 
OSD_SetLogFile("ekenbuild.log");
 
481,21 → 480,10
wm_setapptitle(AppProperName);
 
Bstrcpy(boardfilename, "nukeland.map");
j = 0; netparm = argc;
netparm = argc;
for (i=1; i<argc; i++)
{
if ((!Bstrcasecmp("-net",argv[i])) || (!Bstrcasecmp("/net",argv[i]))) { j = 1; netparm = i; continue; }
if (j)
{
if (argv[i][0] == '-' || argv[i][0] == '/')
{
if (((argv[i][1] == 'n') || (argv[i][1] == 'N')) && (argv[i][2] == '0')) { networkmode = 0; continue; }
if (((argv[i][1] == 'n') || (argv[i][1] == 'N')) && (argv[i][2] == '1')) { networkmode = 1; continue; }
}
if (isvalidipaddress(argv[i])) continue;
}
else
{
if ((!Bstrcasecmp("-net",argv[i])) || (!Bstrcasecmp("/net",argv[i]))) { netparm = i+1; break; }
if (!Bstrcasecmp(argv[i], "-setup"))
{
#if defined STARTUP_SETUP_WINDOW
508,7 → 496,6
if (!Bstrrchr(boardfilename,'.')) Bstrcat(boardfilename,".map");
}
}
}
 
if ((i = Ken_loadsetup(setupfilename)) < 0)
buildputs("Configuration file not found, using defaults.\n");
605,7 → 592,6
loadsong("neatsong.kdm");
musicon();
 
#if 0
if (option[4] > 0)
{
x1 = ((xdim-screensize)>>1);
665,9 → 651,8
else
Bstrcat(getmessage," (Even)");
getmessageleng = Bstrlen(getmessage);
getmessagetimeoff = totalclock+120;
getmessagetimeoff = (int32_t) totalclock+120;
}
#endif
screenpeek = myconnectindex;
reccnt = 0;
for (i=connecthead; i>=0; i=connectpoint2[i]) initplayersprite((short)i);
4511,7 → 4496,7
return;
 
//Re-start fakedomovethings back to place of error
my = omy;
my = omy = pos[myconnectindex];
myzvel = hvel[myconnectindex];
myang = omyang = ang[myconnectindex];
mycursectnum = cursectnum[myconnectindex];
4936,6 → 4921,7
endwall = startwall+sector[dasector].wallnum;
if (endwall <= startwall) continue;
 
da.x = da.y = 0;
minx = 0x7fffffff; maxx = 0x80000000;
miny = 0x7fffffff; maxy = 0x80000000;