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

hopefully fix the nq-wgl crash

Browse source
This commit is contained in:
Bill Currie 2002-05-14 21:30:23 +00:00
parent 22a5182efb
commit fe866e264e
2 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
nq/source/sys_win.c
View file

@ -181,6 +181,11 @@ shutdown (void)
DeinitConProc ();
}
void
Sys_DebugLog (const char *file, const char *fmt, ...)
{
}
const char *
Sys_ConsoleInput (void)
{
@ -315,7 +320,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
}
}
COM_InitArgv (host_parms.argc, (const char**)host_parms.argv);
COM_InitArgv (host_parms.argc, (const char**)argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;
@ -340,21 +345,6 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
SetForegroundWindow (hwnd_dialog);
}
}
#if 0
// take the greater of all the available memory or half the total memory,
// but at least 8 Mb and no more than 16 Mb, unless they explicitly
// request otherwise
parms.memsize = lpBuffer.dwAvailPhys;
if (parms.memsize < MINIMUM_WIN_MEMORY)
parms.memsize = MINIMUM_WIN_MEMORY;
if (parms.memsize < (lpBuffer.dwTotalPhys >> 1))
parms.memsize = lpBuffer.dwTotalPhys >> 1;
if (parms.memsize > MAXIMUM_WIN_MEMORY)
parms.memsize = MAXIMUM_WIN_MEMORY;
#endif
tevent = CreateEvent (NULL, FALSE, FALSE, NULL);
@ -388,14 +378,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
InitConProc (hFile, heventParent, heventChild);
}
// because sound is off until we become active
//XXX S_BlockSound ();
Host_Init ();
Sys_RegisterShutdown (Host_Shutdown);
Sys_RegisterShutdown (shutdown);
Host_Init ();
oldtime = Sys_DoubleTime ();
/* main window message loop */
@ -431,8 +418,3 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
/* return success of application */
return TRUE;
}
void
Sys_DebugLog (const char *file, const char *fmt, ...)
{
}

8
qw/source/cl_sys_win.c
View file

@ -210,10 +210,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
}
}
host_parms.argv = argv;
COM_InitArgv (host_parms.argc, (const char**)host_parms.argv);
COM_InitArgv (host_parms.argc, (const char**)argv);
host_parms.argc = com_argc;
host_parms.argv = com_argv;
@ -241,9 +238,6 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
if (!tevent)
Sys_Error ("Couldn't create event");
// because sound is off until we become active
// XXX S_BlockSound ();
Con_Printf ("Host_Init\n");
Host_Init ();