From 52630598ad9d9fff25af6fd854aa1bc3b097ff9d Mon Sep 17 00:00:00 2001 From: pierow Date: Sun, 13 Aug 2023 15:08:47 -0400 Subject: [PATCH] Debug build config. Works on server dll. Thanks Neoptolemus! --- main/source/Natural_Selection.sln | 14 +- main/source/cl_dll/cl_dll.vcxproj | 420 +++++++++++++++++++++++- main/source/cl_dll/cl_dll.vcxproj.user | 10 +- main/source/dlls/hl.vcxproj | 20 +- main/source/dlls/weapons.cpp | 4 +- main/source/mod/AvHAssert.cpp | 3 +- main/source/mod/AvHHud.cpp | 2 +- main/source/mod/AvHPlayer.cpp | 4 +- main/source/mod/AvHTeam.cpp | 2 +- main/source/particles/particles.vcxproj | 5 +- main/source/util/Stacktrace.cpp | 2 +- main/source/util/Zassert.cpp | 157 ++++----- 12 files changed, 538 insertions(+), 105 deletions(-) diff --git a/main/source/Natural_Selection.sln b/main/source/Natural_Selection.sln index 9f0b6902..f35aff52 100644 --- a/main/source/Natural_Selection.sln +++ b/main/source/Natural_Selection.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.6.33712.159 +VisualStudioVersion = 17.6.33723.286 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cl_dll.dll", "cl_dll\cl_dll.vcxproj", "{665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}" ProjectSection(ProjectDependencies) = postProject @@ -8,9 +8,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cl_dll.dll", "cl_dll\cl_dll EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns.dll", "dlls\hl.vcxproj", "{BC87A180-F17B-83FC-5D7D-470FAD003ABC}" - ProjectSection(ProjectDependencies) = postProject - {5AADD469-7488-4B34-A9FD-01CFAC5972FD} = {5AADD469-7488-4B34-A9FD-01CFAC5972FD} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "particles", "particles\particles.vcxproj", "{5AADD469-7488-4B34-A9FD-01CFAC5972FD}" EndProject @@ -24,8 +21,8 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Debug|Win32.ActiveCfg = Playtest|Win32 - {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Debug|Win32.Build.0 = Playtest|Win32 + {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Debug|Win32.ActiveCfg = client - debug|Win32 + {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Debug|Win32.Build.0 = client - debug|Win32 {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Developer - debug|Win32.ActiveCfg = Playtest|Win32 {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Developer - debug|Win32.Build.0 = Playtest|Win32 {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Developer - release|Win32.ActiveCfg = Playtest|Win32 @@ -36,9 +33,10 @@ Global {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Playtest|Win32.Build.0 = Playtest|Win32 {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Release|Win32.ActiveCfg = Playtest|Win32 {665C1DAF-9248-E06F-4E5C-A664BAFDE9D8}.Release|Win32.Build.0 = Playtest|Win32 - {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Debug|Win32.ActiveCfg = Developer - release|Win32 - {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Debug|Win32.Build.0 = Developer - release|Win32 + {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Debug|Win32.ActiveCfg = Developer - debug|Win32 + {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Debug|Win32.Build.0 = Developer - debug|Win32 {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Developer - debug|Win32.ActiveCfg = Developer - debug|Win32 + {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Developer - debug|Win32.Build.0 = Developer - debug|Win32 {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Developer - release|Win32.ActiveCfg = Developer - release|Win32 {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Playtest - balance disabled|Win32.ActiveCfg = Playtest - balance disabled|Win32 {BC87A180-F17B-83FC-5D7D-470FAD003ABC}.Playtest - balance disabled|Win32.Build.0 = Playtest - balance disabled|Win32 diff --git a/main/source/cl_dll/cl_dll.vcxproj b/main/source/cl_dll/cl_dll.vcxproj index b7f8e491..3ba0b5f9 100644 --- a/main/source/cl_dll/cl_dll.vcxproj +++ b/main/source/cl_dll/cl_dll.vcxproj @@ -1,6 +1,10 @@  + + client - debug + Win32 + Playtest Win32 @@ -24,32 +28,52 @@ MultiByte v143 + + DynamicLibrary + false + false + MultiByte + v143 + true + + + + <_ProjectFileVersion>10.0.30319.1 .\release + .\debug $(Configuration)\ + $(Configuration)\ $(TargetPath)%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat + $(TargetPath)%3b*.obj%3b*.ilk%3b*.pdb%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.bat false + false client + client .;zlib-1.2.8;includes\zlib-1.2.8;source\includes\zlib-1.2.8;main\source\includes\zlib-1.2.8;$(IncludePath) + + .;zlib-1.2.8;includes\zlib-1.2.8;source\includes\zlib-1.2.8;main\source\includes\zlib-1.2.8;$(IncludePath) + + MaxSpeed OnlyExplicitInline false $(SolutionDir);$(SolutionDir)\particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\fmod\inc;$(SolutionDir)\includes\vgui\include;../public;../common;../external;../pm_shared;../game_shared;../mod;../util;../ui;../engine;../cl_dll;../dlls - NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH;_X86_ + _CRT_SECURE_NO_WARNINGS;NDEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH;_X86_ true true @@ -105,678 +129,1072 @@ 0x0409 + + + Disabled + Default + false + $(SolutionDir);$(SolutionDir)\particles;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\fmod\inc;$(SolutionDir)\includes\vgui\include;../public;../common;../external;../pm_shared;../game_shared;../mod;../util;../ui;../engine;../cl_dll;../dlls + _CRT_SECURE_NO_WARNINGS;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ITERATOR_DEBUG_LEVEL=2;_DEBUG;DEBUG;WIN32;_WINDOWS;AVH_CLIENT;USE_OLDAUTH;_X86_ + + + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + false + true + Default + true + true + 4996 + true + MultiThreadedDebugDLL + Neither + false + Default + + + \..\..\Debug\particles.lib;vgui.lib;wsock32.lib;sdl2.lib;opengl32.lib;%(AdditionalDependencies) + true + $(SolutionDir)\particles\Release;$(SolutionDir)\includes\lpng1251;$(SolutionDir)\includes\zlib-1.2.8;$(SolutionDir)\includes\vgui\lib\win32_vc6;$(SolutionDir)\lib\public;%(AdditionalLibraryDirectories) + + + + + + + Windows + $(IntDir)cl_dll.lib + MachineX86 + false + false + + + /NODEFAULTLIB:LIBCMT %(AdditionalOptions) + $(SolutionDir)..\cl_dlls\$(TargetName)$(TargetExt) + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/cl_dll.tlb + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true + true MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) MaxSpeed + MaxSpeed %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) diff --git a/main/source/cl_dll/cl_dll.vcxproj.user b/main/source/cl_dll/cl_dll.vcxproj.user index 14cbff20..521f3f69 100644 --- a/main/source/cl_dll/cl_dll.vcxproj.user +++ b/main/source/cl_dll/cl_dll.vcxproj.user @@ -1,7 +1,15 @@  - ..\..\..\..\..\..\..\Program Files %28x86%29\Steam\SteamApps\common\Half-Life\hl.exe + C:\Program Files (x86)\Steam\steamapps\common\Half-Life\hl.exe + WindowsLocalDebugger + -allowdebug -dev -steam -game ns + ..\.. + false + Auto + + + C:\Program Files (x86)\Steam\steamapps\common\Half-Life\hl.exe WindowsLocalDebugger -allowdebug -dev -steam -game ns ..\.. diff --git a/main/source/dlls/hl.vcxproj b/main/source/dlls/hl.vcxproj index f996b1f8..256b3c54 100644 --- a/main/source/dlls/hl.vcxproj +++ b/main/source/dlls/hl.vcxproj @@ -44,6 +44,7 @@ DynamicLibrary false v143 + true DynamicLibrary @@ -85,6 +86,9 @@ + + ns + Full @@ -140,8 +144,8 @@ Disabled - _DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_SECURE_PRERELEASE_BUILD;USE_OLDAUTH - MultiThreadedDebug + _CRT_SECURE_NO_WARNINGS;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_DEBUG;DEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;USE_OLDAUTH;AVH_NO_NEXUS + MultiThreadedDebugDLL true @@ -150,7 +154,7 @@ $(IntDir) $(IntDir) Level3 - true + false true EditAndContinue Default @@ -158,10 +162,10 @@ $(SolutionDir);$(SolutionDir)\includes\lua\include;$(SolutionDir)\particles\;$(SolutionDir)\includes\vgui\include;$(SolutionDir)\includes\libcurl-7.50-nossl\include;$(SolutionDir)\common;$(SolutionDir)\public;$(SolutionDir)\util;$(SolutionDir)\engine;%(AdditionalIncludeDirectories) - winmm.lib;ws2_32.lib;particles.lib;liblua.lib;liblualib.lib;nexus_server.lib;ssleay32.lib;libeay32.lib;libcurl.lib;%(AdditionalDependencies) - $(SolutionDir)..\dlls\ns.dll + particles.lib;lua5.1.lib;Winmm.lib;%(AdditionalDependencies) + $(SolutionDir)..\dlls\$(TargetName)$(TargetExt) true - U:\debug;%(AdditionalLibraryDirectories) + U:\debug;$(SolutionDir)\Debug;$(SolutionDir)includes\libcurl-7.50-nossl;$(SolutionDir)includes\vgui\lib\win32_vc6;$(SolutionDir)includes\lua\lib;%(AdditionalLibraryDirectories) libcmt;%(IgnoreSpecificDefaultLibraries) .\hl.def true @@ -195,7 +199,7 @@ Full AnySuitable true - NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;USE_OLDAUTH + _CRT_SECURE_NO_WARNINGS;NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;USE_OLDAUTH true true MultiThreadedDLL @@ -254,7 +258,7 @@ true NDEBUG;WIN32;_WINDOWS;QUIVER;VOXEL;QUAKE2;VALVE_DLL;AVH_SERVER;AVH_NO_NEXUS;SERVER;AVH_PLAYTEST_BUILD;USE_OLDAUTH true - false + true MultiThreadedDLL true true diff --git a/main/source/dlls/weapons.cpp b/main/source/dlls/weapons.cpp index 3e9e151c..f477f169 100644 --- a/main/source/dlls/weapons.cpp +++ b/main/source/dlls/weapons.cpp @@ -1501,7 +1501,7 @@ void CBasePlayerAmmo :: DefaultTouch( CBaseEntity *pOther ) //========================================================= int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon ) { - int iReturn; + int iReturn = 0; if ( pszAmmo1() != NULL ) { @@ -1524,7 +1524,7 @@ int CBasePlayerWeapon::ExtractAmmo( CBasePlayerWeapon *pWeapon ) //========================================================= int CBasePlayerWeapon::ExtractClipAmmo( CBasePlayerWeapon *pWeapon ) { - int iAmmo; + int iAmmo = 0; if ( m_iClip == WEAPON_NOCLIP ) { diff --git a/main/source/mod/AvHAssert.cpp b/main/source/mod/AvHAssert.cpp index a71a3493..280ac667 100644 --- a/main/source/mod/AvHAssert.cpp +++ b/main/source/mod/AvHAssert.cpp @@ -69,7 +69,8 @@ DBG_AssertFunction( #endif #ifdef WIN32 - _assert((void*)szExpr, (void*)szFile, szLine); + //_assert((void*)szExpr, (void*)szFile, szLine); + assert(fExpr); #else assert(fExpr); #endif diff --git a/main/source/mod/AvHHud.cpp b/main/source/mod/AvHHud.cpp index 1930507e..a9735e88 100644 --- a/main/source/mod/AvHHud.cpp +++ b/main/source/mod/AvHHud.cpp @@ -706,7 +706,7 @@ typedef struct alias_t { void TestAlias() { - cmdalias_t* alias = gEngfuncs.pfnGetAliases();// *(alias_s**)0x02d29b7c; + cmdalias_t* alias = gEngfuncs.pfnGetAliasList();// *(alias_s**)0x02d29b7c; while(alias) { gEngfuncs.Con_Printf("%s=%s\n%x - %x\n", alias->name, alias->value, alias, gEngfuncs); diff --git a/main/source/mod/AvHPlayer.cpp b/main/source/mod/AvHPlayer.cpp index 23526462..403374bb 100644 --- a/main/source/mod/AvHPlayer.cpp +++ b/main/source/mod/AvHPlayer.cpp @@ -9692,8 +9692,8 @@ void AvHPlayer::UpdateFog() if(this->mClientCurrentFogEntity != this->mCurrentFogEntity) { bool theFogEnabled = this->mCurrentFogEntity > -1; - int theR, theG, theB; - float theStart, theEnd; + int theR = 0, theG = 0, theB = 0; + float theStart = 0.0f, theEnd = 0.0f; if(theFogEnabled) { diff --git a/main/source/mod/AvHTeam.cpp b/main/source/mod/AvHTeam.cpp index 34e032a9..a6438afc 100644 --- a/main/source/mod/AvHTeam.cpp +++ b/main/source/mod/AvHTeam.cpp @@ -1575,7 +1575,7 @@ void AvHTeam::UpdateTeamStructures() // Fill in hive status int theStatus = kHiveInfoStatusBuilt; - int theBuildTime; + int theBuildTime = 0; // Unbuilt hives if(theEntity->pev->team == 0) diff --git a/main/source/particles/particles.vcxproj b/main/source/particles/particles.vcxproj index 54c836a8..76167d46 100644 --- a/main/source/particles/particles.vcxproj +++ b/main/source/particles/particles.vcxproj @@ -15,7 +15,7 @@ ManagedCProj particles 10.0 - v4.8.1 + v4.7.2 @@ -50,7 +50,8 @@ Level3 - WIN32;_DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;DEBUG;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ITERATOR_DEBUG_LEVEL=2;%(PreprocessorDefinitions) + MultiThreadedDebugDLL true diff --git a/main/source/util/Stacktrace.cpp b/main/source/util/Stacktrace.cpp index f5ceafbd..682a39db 100644 --- a/main/source/util/Stacktrace.cpp +++ b/main/source/util/Stacktrace.cpp @@ -262,7 +262,7 @@ char *stackTrace( int skipAssert ) { } break; case 'M': - OUTS "%f", *a ); + OUTS "%u", *a ); break; case 'N': // TODO diff --git a/main/source/util/Zassert.cpp b/main/source/util/Zassert.cpp index b5c49170..b98af097 100644 --- a/main/source/util/Zassert.cpp +++ b/main/source/util/Zassert.cpp @@ -228,94 +228,97 @@ void runAssertBox( void* inWnd ) { #endif int emailMsgTo( char *msg, char *emailAddress ) { - struct hostent *hostEnt; - int ip = 0; - sockaddr_in sockAddr; - int sockFD; - int _send, _recv, _connect; - char *computerName = ""; - char *emailAt; - char *s = (char *)alloca( strlen(msg) + 256 ); // send buffer - char r[2048]; // recv buffer - - #ifdef WIN32 - WSAData wsaData; - int ret = WSAStartup(0x0101, &wsaData); - if( ret != 0 ) goto error; - #endif + ///////////////////////////////////////////////////////////////////////////////////////////////////// + ////// 2021 - Unused library removal. Uncomment and reinclude libcurl to add back. //// + //////////////////////////////////////////////////////////////////////////////////////////////////// + //struct hostent *hostEnt; + //int ip = 0; + //sockaddr_in sockAddr; + //int sockFD; + //int _send, _recv, _connect; + //char *computerName = ""; + //char *emailAt; + //char *s = (char *)alloca( strlen(msg) + 256 ); // send buffer + //char r[2048]; // recv buffer + // + //#ifdef WIN32 + // WSAData wsaData; + // int ret = WSAStartup(0x0101, &wsaData); + // if( ret != 0 ) goto error; + //#endif - sockFD = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP ); - if( sockFD < 0 ) goto error; + //sockFD = socket( PF_INET, SOCK_STREAM, IPPROTO_TCP ); + //if( sockFD < 0 ) goto error; - // Parse the emailAddress to get the copmuter name after the '@' - emailAt = strchr( emailAddress, '@' ); - if( emailAt ) { - computerName = emailAt+1; - } + //// Parse the emailAddress to get the copmuter name after the '@' + //emailAt = strchr( emailAddress, '@' ); + //if( emailAt ) { + // computerName = emailAt+1; + //} - ip = inet_addr( computerName ); - if( ip == INADDR_NONE ) { - hostEnt = gethostbyname( computerName ); - if( hostEnt ) { - ip = *(int *)hostEnt->h_addr; - } - } - memset( &sockAddr, 0, sizeof(sockAddr) ); - sockAddr.sin_family = AF_INET; - sockAddr.sin_port = htons(25); // 25 = SMTP port - sockAddr.sin_addr.s_addr = ip; + //ip = inet_addr( computerName ); + //if( ip == INADDR_NONE ) { + // hostEnt = gethostbyname( computerName ); + // if( hostEnt ) { + // ip = *(int *)hostEnt->h_addr; + // } + //} + //memset( &sockAddr, 0, sizeof(sockAddr) ); + //sockAddr.sin_family = AF_INET; + //sockAddr.sin_port = htons(25); // 25 = SMTP port + //sockAddr.sin_addr.s_addr = ip; - _connect = connect( sockFD, (struct sockaddr *)&sockAddr, sizeof(sockAddr) ); - if( _connect < 0 ) goto error; + //_connect = connect( sockFD, (struct sockaddr *)&sockAddr, sizeof(sockAddr) ); + //if( _connect < 0 ) goto error; - memset( r, 0, 256 ); - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '2' ) goto error; + //memset( r, 0, 256 ); + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '2' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "HELO overmind.org\r\n" ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '2' ) goto error; + //memset( r, 0, 256 ); + //sprintf( s, "HELO overmind.org\r\n" ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '2' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "MAIL FROM: ns-assert@overmind.org\r\n" ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '2' ) goto error; + //memset( r, 0, 256 ); + //sprintf( s, "MAIL FROM: ns-assert@overmind.org\r\n" ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '2' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "RCPT TO: %s\r\n", emailAddress ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '2' ) goto error; + //memset( r, 0, 256 ); + //sprintf( s, "RCPT TO: %s\r\n", emailAddress ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '2' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "DATA\r\n" ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '3' ) goto error; + //memset( r, 0, 256 ); + //sprintf( s, "DATA\r\n" ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '3' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "From ns-assert@overmind.org\r\nSubject: NS Assert\r\n%s\r\n.\r\n", msg ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - if( r[0] != '2' ) goto error; + //memset( r, 0, 256 ); + //sprintf( s, "From ns-assert@overmind.org\r\nSubject: NS Assert\r\n%s\r\n.\r\n", msg ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //if( r[0] != '2' ) goto error; - memset( r, 0, 256 ); - sprintf( s, "QUIT\r\n" ); - _send = send( sockFD, s, strlen(s), 0 ); - if( _send < 0 ) goto error; - _recv = recv( sockFD, r, 256, 0 ); - CLOSESOCKET( sockFD ); + //memset( r, 0, 256 ); + //sprintf( s, "QUIT\r\n" ); + //_send = send( sockFD, s, strlen(s), 0 ); + //if( _send < 0 ) goto error; + //_recv = recv( sockFD, r, 256, 0 ); + //CLOSESOCKET( sockFD ); return 1; - error: - CLOSESOCKET( sockFD ); - return 0; + //error: + //CLOSESOCKET( sockFD ); + //return 0; }