remember the last IP address entered for UDP instead of parsing -ip_hostaddr
This commit is contained in:
parent
dfdea820dc
commit
3aa8f5ece7
|
@ -3,6 +3,7 @@ D1X-Rebirth Changelog
|
||||||
20080516
|
20080516
|
||||||
--------
|
--------
|
||||||
main/multi.c, main/multibot.c, main/netpkt.c, main/network.c: fix remaining endian bugs in network code, now it works on the Mac
|
main/multi.c, main/multibot.c, main/netpkt.c, main/network.c: fix remaining endian bugs in network code, now it works on the Mac
|
||||||
|
d1x.ini, include/args.h, main/config.c, main/config.h, main/inferno.c, main/menu.c, misc/args.c: remember the last IP address entered for UDP instead of parsing -ip_hostaddr
|
||||||
|
|
||||||
20080510
|
20080510
|
||||||
--------
|
--------
|
||||||
|
|
1
d1x.ini
1
d1x.ini
|
@ -38,6 +38,5 @@
|
||||||
;-noredundancy Do not send messages when picking up redundant items in multiplayer
|
;-noredundancy Do not send messages when picking up redundant items in multiplayer
|
||||||
;-playermessages View only messages from other players in multi - overrides -noredundancy
|
;-playermessages View only messages from other players in multi - overrides -noredundancy
|
||||||
;-ipxnetwork <n> Use IPX network number <n>
|
;-ipxnetwork <n> Use IPX network number <n>
|
||||||
;-ip_hostaddr <n> Use <n> as host ip address
|
|
||||||
;-ip_baseport <n> Use <p> as offset from normal port
|
;-ip_baseport <n> Use <p> as offset from normal port
|
||||||
;-ip_relay Relay players with closed port over host (increases traffic and lag)
|
;-ip_relay Relay players with closed port over host (increases traffic and lag)
|
||||||
|
|
|
@ -69,7 +69,6 @@ typedef struct Arg
|
||||||
int MplNoRedundancy;
|
int MplNoRedundancy;
|
||||||
int MplPlayerMessages;
|
int MplPlayerMessages;
|
||||||
const char *MplIpxNetwork;
|
const char *MplIpxNetwork;
|
||||||
char *MplIpHostAddr;
|
|
||||||
int MplIpBasePort;
|
int MplIpBasePort;
|
||||||
int MplIpRelay;
|
int MplIpRelay;
|
||||||
int DbgVerbose;
|
int DbgVerbose;
|
||||||
|
|
|
@ -56,6 +56,7 @@ static char *VSyncStr="VSync";
|
||||||
static char *MultisampleStr="Multisample";
|
static char *MultisampleStr="Multisample";
|
||||||
static char *JukeboxOnStr="JukeboxOn";
|
static char *JukeboxOnStr="JukeboxOn";
|
||||||
static char *JukeboxPathStr="JukeboxPath";
|
static char *JukeboxPathStr="JukeboxPath";
|
||||||
|
static char *IPHostAddrStr="IPHostAddr";
|
||||||
|
|
||||||
int ReadConfigFile()
|
int ReadConfigFile()
|
||||||
{
|
{
|
||||||
|
@ -79,6 +80,7 @@ int ReadConfigFile()
|
||||||
GameCfg.Multisample = 0;
|
GameCfg.Multisample = 0;
|
||||||
GameCfg.JukeboxOn = 0;
|
GameCfg.JukeboxOn = 0;
|
||||||
memset(GameCfg.JukeboxPath,0,PATH_MAX+1);
|
memset(GameCfg.JukeboxPath,0,PATH_MAX+1);
|
||||||
|
memset(GameCfg.MplIpHostAddr, 0, 128);
|
||||||
|
|
||||||
infile = PHYSFSX_openReadBuffered("descent.cfg");
|
infile = PHYSFSX_openReadBuffered("descent.cfg");
|
||||||
|
|
||||||
|
@ -144,6 +146,12 @@ int ReadConfigFile()
|
||||||
p = strchr( GameCfg.JukeboxPath, '\n');
|
p = strchr( GameCfg.JukeboxPath, '\n');
|
||||||
if ( p ) *p = 0;
|
if ( p ) *p = 0;
|
||||||
}
|
}
|
||||||
|
else if (!strcmp(token, IPHostAddrStr)) {
|
||||||
|
char * p;
|
||||||
|
strncpy( GameCfg.MplIpHostAddr, value, 128 );
|
||||||
|
p = strchr( GameCfg.MplIpHostAddr, '\n');
|
||||||
|
if ( p ) *p = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,6 +196,7 @@ int WriteConfigFile()
|
||||||
PHYSFSX_printf(infile, "%s=%i\n", MultisampleStr, GameCfg.Multisample);
|
PHYSFSX_printf(infile, "%s=%i\n", MultisampleStr, GameCfg.Multisample);
|
||||||
PHYSFSX_printf(infile, "%s=%i\n", JukeboxOnStr, GameCfg.JukeboxOn);
|
PHYSFSX_printf(infile, "%s=%i\n", JukeboxOnStr, GameCfg.JukeboxOn);
|
||||||
PHYSFSX_printf(infile, "%s=%s\n", JukeboxPathStr, GameCfg.JukeboxPath );
|
PHYSFSX_printf(infile, "%s=%s\n", JukeboxPathStr, GameCfg.JukeboxPath );
|
||||||
|
PHYSFSX_printf(infile, "%s=%s\n", IPHostAddrStr, GameCfg.MplIpHostAddr );
|
||||||
|
|
||||||
PHYSFS_close(infile);
|
PHYSFS_close(infile);
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,7 @@ typedef struct Cfg
|
||||||
int Multisample;
|
int Multisample;
|
||||||
int JukeboxOn;
|
int JukeboxOn;
|
||||||
char JukeboxPath[PATH_MAX+1];
|
char JukeboxPath[PATH_MAX+1];
|
||||||
|
char MplIpHostAddr[128];
|
||||||
} __pack__ Cfg;
|
} __pack__ Cfg;
|
||||||
|
|
||||||
extern struct Cfg GameCfg;
|
extern struct Cfg GameCfg;
|
||||||
|
|
|
@ -175,7 +175,6 @@ void show_commandline_help()
|
||||||
printf( " -noredundancy %s\n", "Do not send messages when picking up redundant items in multiplayer");
|
printf( " -noredundancy %s\n", "Do not send messages when picking up redundant items in multiplayer");
|
||||||
printf( " -playermessages %s\n", "View only messages from other players in multi - overrides -noredundancy");
|
printf( " -playermessages %s\n", "View only messages from other players in multi - overrides -noredundancy");
|
||||||
printf( " -ipxnetwork <n> %s\n", "Use IPX network number <n>");
|
printf( " -ipxnetwork <n> %s\n", "Use IPX network number <n>");
|
||||||
printf( " -ip_hostaddr <n> %s\n", "Use <n> as host ip address");
|
|
||||||
printf( " -ip_baseport <n> %s\n", "Use <n> as offset from normal port (allows multiple instances of d1x to be run on a single computer)");
|
printf( " -ip_baseport <n> %s\n", "Use <n> as offset from normal port (allows multiple instances of d1x to be run on a single computer)");
|
||||||
printf( " -ip_relay %s\n", "Relay players with closed port over host (increases traffic and lag)");
|
printf( " -ip_relay %s\n", "Relay players with closed port over host (increases traffic and lag)");
|
||||||
#endif // NETWORK
|
#endif // NETWORK
|
||||||
|
|
|
@ -770,8 +770,8 @@ void do_ip_manual_join_menu()
|
||||||
int old_game_mode;
|
int old_game_mode;
|
||||||
char buf[128]="";
|
char buf[128]="";
|
||||||
|
|
||||||
if (GameArg.MplIpHostAddr) {
|
if (*GameCfg.MplIpHostAddr) {
|
||||||
sprintf(buf,"%s",GameArg.MplIpHostAddr);
|
sprintf(buf,"%s",GameCfg.MplIpHostAddr);
|
||||||
|
|
||||||
for (j=0; buf[j] != '\0'; j++) {
|
for (j=0; buf[j] != '\0'; j++) {
|
||||||
switch (buf[j]) {
|
switch (buf[j]) {
|
||||||
|
@ -794,7 +794,10 @@ void do_ip_manual_join_menu()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (old_game_mode != Game_mode)
|
if (old_game_mode != Game_mode)
|
||||||
|
{
|
||||||
|
strncpy(GameCfg.MplIpHostAddr, buf, 128);
|
||||||
break; // leave menu
|
break; // leave menu
|
||||||
|
}
|
||||||
} while( choice > -1 );
|
} while( choice > -1 );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -176,7 +176,6 @@ void ReadCmdArgs(void)
|
||||||
GameArg.MplNoRedundancy = FindArg("-noredundancy");
|
GameArg.MplNoRedundancy = FindArg("-noredundancy");
|
||||||
GameArg.MplPlayerMessages = FindArg("-playermessages");
|
GameArg.MplPlayerMessages = FindArg("-playermessages");
|
||||||
GameArg.MplIpxNetwork = get_str_arg("-ipxnetwork", NULL);
|
GameArg.MplIpxNetwork = get_str_arg("-ipxnetwork", NULL);
|
||||||
GameArg.MplIpHostAddr = get_str_arg("-ip_hostaddr", "");
|
|
||||||
GameArg.MplIpBasePort = get_int_arg("-ip_baseport", 0);
|
GameArg.MplIpBasePort = get_int_arg("-ip_baseport", 0);
|
||||||
GameArg.MplIpRelay = FindArg("-ip_relay");
|
GameArg.MplIpRelay = FindArg("-ip_relay");
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue