OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Merged the GC branch back into the trunk, so now it can receive more

Browse source 
testing from the people who download SVN trunk builds.

SVN r795 (trunk)
This commit is contained in:
Randy Heit 2008-03-12 02:56:11 +00:00
commit f2660dc336
88 changed files with 2541 additions and 1523 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/i_net.cpp
View file

@ -564,7 +564,7 @@ void HostGame (int i)
int node;
int gotack[MAXNETNODES+1];
if ((i == Args.NumArgs() - 1) || !(numplayers = atoi (Args.GetArg(i+1))))
if ((i == Args->NumArgs() - 1) || !(numplayers = atoi (Args->GetArg(i+1))))
{ // No player count specified, assume 2
numplayers = 2;
}
@ -742,15 +742,15 @@ bool Guest_WaitForOthers (void *userdata)
void JoinGame (int i)
{
if ((i == Args.NumArgs() - 1) ||
(Args.GetArg(i+1)[0] == '-') ||
(Args.GetArg(i+1)[0] == '+'))
if ((i == Args->NumArgs() - 1) ||
(Args->GetArg(i+1)[0] == '-') ||
(Args->GetArg(i+1)[0] == '+'))
I_FatalError ("You need to specify the host machine's address");
StartNetwork (true);
// Host is always node 1
BuildAddress (&sendaddress[1], Args.GetArg(i+1));
BuildAddress (&sendaddress[1], Args->GetArg(i+1));
sendplayer[1] = 0;
doomcom.numnodes = 2;
@ -789,7 +789,7 @@ void I_InitNetwork (void)
memset (&doomcom, 0, sizeof(doomcom));
// set up for network
v = Args.CheckValue ("-dup");
v = Args->CheckValue ("-dup");
if (v)
{
doomcom.ticdup = clamp (atoi (v), 1, MAXTICDUP);
@ -799,12 +799,12 @@ void I_InitNetwork (void)
doomcom.ticdup = 1;
}
if (Args.CheckParm ("-extratic"))
if (Args->CheckParm ("-extratic"))
doomcom.extratics = 1;
else
doomcom.extratics = 0;
v = Args.CheckValue ("-port");
v = Args->CheckValue ("-port");
if (v)
{
DOOMPORT = atoi (v);
@ -814,11 +814,11 @@ void I_InitNetwork (void)
// parse network game options,
// player 1: -host <numplayers>
// player x: -join <player 1's address>
if ( (i = Args.CheckParm ("-host")) )
if ( (i = Args->CheckParm ("-host")) )
{
HostGame (i);
}
else if ( (i = Args.CheckParm ("-join")) )
else if ( (i = Args->CheckParm ("-join")) )
{
JoinGame (i);
}