From c9a530f5a0834ceafd6282aecab0c25d331e979a Mon Sep 17 00:00:00 2001 From: havoc Date: Tue, 20 Aug 2002 02:50:38 +0000 Subject: [PATCH] sys_usetimegettime is now initialized at a place where it shouldn't crash anymore (this should make win32 run again) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2259 d7cf8633-e32d-0410-b094-e92efae38249 --- host.c | 1 - sys_shared.c | 2 ++ sys_win.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/host.c b/host.c index 20d22b8b..5d570bec 100644 --- a/host.c +++ b/host.c @@ -817,7 +817,6 @@ void Host_Init (void) developer.value = 1; } - Memory_Init (); Cmd_Init (); Memory_Init_Commands(); R_Modules_Init(); diff --git a/sys_shared.c b/sys_shared.c index 0753133c..370752bf 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -106,6 +106,8 @@ char engineversion[128]; void Sys_Shared_EarlyInit(void) { + Memory_Init (); + #if defined(__linux__) sprintf (engineversion, "%s Linux %s", gamename, buildstring); #elif defined(WIN32) diff --git a/sys_win.c b/sys_win.c index 1479e7c8..15156556 100644 --- a/sys_win.c +++ b/sys_win.c @@ -484,8 +484,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin if (hPrevInstance) return 0; - Cvar_RegisterVariable(&sys_usetimegettime); - global_hInstance = hInstance; global_nCmdShow = nCmdShow; @@ -536,6 +534,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin Sys_Shared_EarlyInit(); + Cvar_RegisterVariable(&sys_usetimegettime); + tevent = CreateEvent(NULL, false, false, NULL); if (!tevent) -- 2.39.2