XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- pass server and rconpasswords on the command line

Browse Source 
- fix q3 rcon_password -> rconpassword


git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@86 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2001-09-27 10:45:23 +00:00 committed by l-n
parent 04ccd79abc
commit efda730b9c
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xqf/ChangeLog
View File

@ -3,6 +3,8 @@ Sep 27, 2001: Ludwig Nussel <l-n@sourceforge.net>
- identify q3/rtcw servers by their version string - identify q3/rtcw servers by their version string
- use common option struct for all games with q3 engine - use common option struct for all games with q3 engine
- add configuration options for Wolfenstein to q3 tab - add configuration options for Wolfenstein to q3 tab
- pass server and rconpasswords on the command line
- fix q3 rcon_password -> rconpassword
Sept 24,2001: Alex Burger <alex@fragit_dot_net> Sept 24,2001: Alex Burger <alex@fragit_dot_net>
- Changed version to 0.9.7a - Changed version to 0.9.7a

22
xqf/src/game.c
View File

@ -1039,6 +1039,12 @@ static void q3_analyze_serverinfo (struct server *s) {
{ {
s->type=WO_SERVER; s->type=WO_SERVER;
} }
// voyager elite force, not supported
else if(!strncmp(info_ptr[1],"ST:V HM",7))
{
s->type=Q3_SERVER;
}
} }
else if (strcmp (*info_ptr, "gamename") == 0) { else if (strcmp (*info_ptr, "gamename") == 0) {
@ -1285,7 +1291,7 @@ static int write_passwords (const char *filename, const struct condef *con) {
fprintf (f, "spectator \"%s\"\n", con->spectator_password); fprintf (f, "spectator \"%s\"\n", con->spectator_password);
if (con->rcon_password) if (con->rcon_password)
fprintf (f, "rcon_password \"%s\"\n", con->rcon_password); fprintf (f, "rconpassword \"%s\"\n", con->rcon_password);
fclose (f); fclose (f);
return TRUE; return TRUE;
@ -1750,6 +1756,7 @@ static int q3_exec (const struct condef *con, int forkit) {
argv[argi++] = "0"; argv[argi++] = "0";
} }
#if 0 // who cares if the password is visible in the process list?
if (con->password || con->rcon_password) { if (con->password || con->rcon_password) {
game_dir = quake3_data_dir (g->real_dir); game_dir = quake3_data_dir (g->real_dir);
@ -1770,6 +1777,19 @@ static int q3_exec (const struct condef *con, int forkit) {
argv[argi++] = "+exec"; argv[argi++] = "+exec";
argv[argi++] = PASSWORD_CFG; argv[argi++] = PASSWORD_CFG;
} }
#else
if (con->rcon_password)
{
argv[argi++] = "+rconpassword";
argv[argi++] = con->rcon_password;
}
if (con->password)
{
argv[argi++] = "+password";
argv[argi++] = con->password;
}
#endif
if (con->server) { if (con->server) {
argv[argi++] = "+connect"; argv[argi++] = "+connect";