qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove redundant calls to COM_InitArgv

Browse source
This commit is contained in:
Bill Currie 2003-09-22 23:17:47 +00:00
parent ba26628b80
commit 12a90e9233
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nq/source/sys_unixd.c
View file

@ -80,13 +80,15 @@ int
main (int argc, const char **argv)
{
double time, oldtime, newtime;
int i;
memset (&host_parms, 0, sizeof (host_parms));
COM_InitArgv (argc, argv);
// dedicated server ONLY!
if (!COM_CheckParm ("-dedicated")) {
for (i = 1; i < argc; i++)
if (!strcmp (argv[i], "-dedicated"))
break;
if (i != argc) {
const char **newargv;
newargv = malloc ((argc + 2) * sizeof (*newargv));
@ -94,11 +96,12 @@ main (int argc, const char **argv)
newargv[argc++] = "-dedicated";
newargv[argc] = 0;
argv = newargv;
COM_InitArgv (argc, argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;
}
COM_InitArgv (argc, argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);
Sys_RegisterShutdown (Host_Shutdown);

19
nq/source/sys_wind.c
View file

@ -52,12 +52,11 @@ shutdown (void)
{
}
const char *newargv[256];
int
main (int argc, const char **argv)
{
double time, oldtime;
int i;
memset (&host_parms, 0, sizeof (host_parms));
@ -66,17 +65,21 @@ main (int argc, const char **argv)
if (cwd[Q_strlen (cwd) - 1] == '\\')
cwd[Q_strlen (cwd) - 1] = 0;
#endif
COM_InitArgv (argc, argv);
// dedicated server ONLY!
if (!COM_CheckParm ("-dedicated")) {
for (i = 1; i < argc; i++)
if (!strcmp (argv[i], "-dedicated"))
break;
if (i != argc) {
const char **newargv;
newargv = malloc ((argc + 2) * sizeof (*newargv));
memcpy (newargv, argv, argc * 4);
newargv[argc] = "-dedicated";
argc++;
newargv[argc++] = "-dedicated";
newargv[argc] = 0;
argv = newargv;
COM_InitArgv (argc, argv);
}
COM_InitArgv (argc, argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;

2
qw/source/sv_main.c
View file

@ -2475,8 +2475,6 @@ SV_Init_Memory (void)
void
SV_Init (void)
{
COM_InitArgv (host_parms.argc, (const char**)host_parms.argv);
sv_cbuf = Cbuf_New (&id_interp);
sv_args = Cbuf_ArgsNew ();

3
qw/source/sv_sys_win.c
View file

@ -82,8 +82,9 @@ main (int argc, const char **argv)
startup ();
COM_InitArgv (argc, argv);
memset (&host_parms, 0, sizeof (host_parms));
COM_InitArgv (argc, argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;