From b45295ef7c81063fa56bad478e2c6e7f75e8f677 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Wed, 13 Dec 2023 21:28:17 +0300 Subject: [PATCH] dedicated(win32): fix crashes( now it works #310 #225 ) --- dedicated/sys_ded.cpp | 2 +- engine/cl_null.cpp | 4 ---- engine/{sys_linuxwind.cpp => sys_stubwind.cpp} | 0 engine/wscript | 13 ++++--------- 4 files changed, 5 insertions(+), 14 deletions(-) rename engine/{sys_linuxwind.cpp => sys_stubwind.cpp} (100%) diff --git a/dedicated/sys_ded.cpp b/dedicated/sys_ded.cpp index f1ff4449..50f9f24a 100644 --- a/dedicated/sys_ded.cpp +++ b/dedicated/sys_ded.cpp @@ -278,7 +278,7 @@ bool CDedicatedAppSystemGroup::PreInit( ) return false; #ifdef _WIN32 - g_bVGui = !CommandLine()->CheckParm( "-console" ); + g_bVGui = CommandLine()->CheckParm( "-vgui" ); #endif CreateInterfaceFn factory = GetFactory(); diff --git a/engine/cl_null.cpp b/engine/cl_null.cpp index 8dc14434..c3233c33 100644 --- a/engine/cl_null.cpp +++ b/engine/cl_null.cpp @@ -191,8 +191,4 @@ CClientState cl; char g_minidumpinfo[ 4096 ] = {0}; PAGED_POOL_INFO_t g_pagedpoolinfo = { 0 }; -int g_iVCRPlaybackSleepInterval = 0; -IGame *game = NULL; - - #endif diff --git a/engine/sys_linuxwind.cpp b/engine/sys_stubwind.cpp similarity index 100% rename from engine/sys_linuxwind.cpp rename to engine/sys_stubwind.cpp diff --git a/engine/wscript b/engine/wscript index 8270bd34..92cb78da 100755 --- a/engine/wscript +++ b/engine/wscript @@ -221,19 +221,14 @@ def build(bld): ] if bld.env.DEST_OS == 'win32': - source += [ - '../public/tier0/memoverride.cpp', - ] + source += ['../public/tier0/memoverride.cpp'] else: - source += [ - 'sys_linuxwind.cpp', - 'audio/snd_posix.cpp', - ] + source += ['audio/snd_posix.cpp'] if bld.env.DEDICATED: - source += ['cl_null.cpp'] + source += ['cl_null.cpp', 'sys_stubwind.cpp'] else: - source += source_win if bld.env.DEST_OS == 'win32' else [] + source += source_win if bld.env.DEST_OS == 'win32' else ['sys_stubwind.cpp'] source += [ 'client_pch.cpp',