Update ChangeLog for 0.9.5a-beta

git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@17 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Alex Burger 2000-11-26 02:51:29 +00:00 committed by alex_b
parent 5365ca89c9
commit a2e9a7d0dc
4 changed files with 43 additions and 3 deletions

View File

@ -1,3 +1,7 @@
Nov 24th 2000: Alex Burger <alex@fragit.net>
-Version changed to XQF 0.9.5a-beta
-Fixed UT launching. Now passes proper parameters to UT
Nov 18th 2000: Alex Burger <alex@fragit.net> Nov 18th 2000: Alex Burger <alex@fragit.net>
-Version changed to XQF 0.9.5 -Version changed to XQF 0.9.5

View File

@ -1,5 +1,5 @@
XQF 0.9.5 XQF 0.9.5a beta
(November 18th 2000) (November 18th 2000)
DESCRIPTION DESCRIPTION

View File

@ -71,6 +71,7 @@ static int qw_exec (const struct condef *con, int forkit);
static int q3_exec (const struct condef *con, int forkit); static int q3_exec (const struct condef *con, int forkit);
#endif #endif
static int q2_exec_generic (const struct condef *con, int forkit); static int q2_exec_generic (const struct condef *con, int forkit);
static int ut_exec (const struct condef *con, int forkit);
static GList *q1_custom_cfgs (char *dir, char *game); static GList *q1_custom_cfgs (char *dir, char *game);
static GList *qw_custom_cfgs (char *dir, char *game); static GList *qw_custom_cfgs (char *dir, char *game);
@ -368,7 +369,7 @@ struct game games[] = {
NULL, NULL,
config_is_valid_generic, config_is_valid_generic,
NULL, NULL,
q2_exec_generic, ut_exec,
NULL, NULL,
quake_save_info quake_save_info
}, },
@ -1511,6 +1512,40 @@ static int q2_exec_generic (const struct condef *con, int forkit) {
return retval; return retval;
} }
static int ut_exec (const struct condef *con, int forkit) {
char *argv[32];
int argi = 0;
char *cmd;
struct game *g = &games[con->s->type];
int retval;
cmd = strdup_strip (g->cmd);
argv[argi++] = strtok (cmd, delim);
while ((argv[argi] = strtok (NULL, delim)) != NULL)
argi++;
// Pass server IP address first otherwise it won't work.
// Make sure ut/ut script (from installed game) contains
// exec "./ut-bin" $* -log and not -log $* at the end
// otherwise XQF you can not connect via the command line!
if (con->server) {
argv[argi++] = con->server;
}
if (default_nosound) {
argv[argi++] = "-nosound";
}
argv[argi] = NULL;
retval = client_launch_exec (forkit, g->real_dir, argv, con->s);
g_free (cmd);
return retval;
}
static char *dir_custom_cfg_filter (const char *dir, const char *str) { static char *dir_custom_cfg_filter (const char *dir, const char *str) {
static const char *cfgext[] = { ".cfg", ".scr", ".rc", NULL }; static const char *cfgext[] = { ".cfg", ".scr", ".rc", NULL };

View File

@ -573,7 +573,8 @@ static void launch_close_handler (struct stat_job *job, int killed) {
} }
} }
con->server = g_strdup_printf ("%s:%5d", inet_ntoa (s->host->ip), s->port); // con->server = g_strdup_printf ("%s:%5d", inet_ntoa (s->host->ip), s->port);
con->server = g_strdup_printf ("%s:%d", inet_ntoa (s->host->ip), s->port);
con->gamedir = g_strdup (s->game); con->gamedir = g_strdup (s->game);
if (props && props->rcon_password) if (props && props->rcon_password)