From 67d466865256f23a21d0dbf0029ab5ba45f01679 Mon Sep 17 00:00:00 2001 From: wowzersdude Date: Fri, 7 Feb 2025 16:26:45 -0500 Subject: [PATCH 1/3] Updated .gitignore to exclude .vs and build files --- .gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d8eb475df --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +# Ignore Visual Studio files +.vs/ + +# Ignore compiled binaries +*.obj +*.exe +*.dll + +# Ignore build output directories +bin/ +build/ From 0466263ba4f2e5a58d20ccf0c58f96caf114de3c Mon Sep 17 00:00:00 2001 From: wowzersdude Date: Fri, 7 Feb 2025 17:16:31 -0500 Subject: [PATCH 2/3] Saved version before new changes --- .gitignore.txt | 1 + Backup/q4sdk.sln | 46 ++ UpgradeLog.htm | 363 +++++++++++++++ game.vcxproj | 496 ++++++++++++++++++++ game.vcxproj.filters | 837 ++++++++++++++++++++++++++++++++++ game.vcxproj.user | 4 + game/gamesys/Class.cpp | 2 +- game/gamesys/SaveGame.cpp | 2 +- game/gamesys/SysCmds.cpp | 4 +- game/weapon/WeaponBlaster.cpp | 2 +- idlib.vcxproj | 327 +++++++++++++ idlib.vcxproj.filters | 467 +++++++++++++++++++ idlib.vcxproj.user | 4 + idlib/math/Simd.cpp | 4 +- mpgame.vcxproj | 491 ++++++++++++++++++++ mpgame.vcxproj.filters | 837 ++++++++++++++++++++++++++++++++++ mpgame.vcxproj.user | 4 + q4sdk.sln | 70 ++- 18 files changed, 3916 insertions(+), 45 deletions(-) create mode 100644 .gitignore.txt create mode 100644 Backup/q4sdk.sln create mode 100644 UpgradeLog.htm create mode 100644 game.vcxproj create mode 100644 game.vcxproj.filters create mode 100644 game.vcxproj.user create mode 100644 idlib.vcxproj create mode 100644 idlib.vcxproj.filters create mode 100644 idlib.vcxproj.user create mode 100644 mpgame.vcxproj create mode 100644 mpgame.vcxproj.filters create mode 100644 mpgame.vcxproj.user diff --git a/.gitignore.txt b/.gitignore.txt new file mode 100644 index 000000000..a4d6d9c60 --- /dev/null +++ b/.gitignore.txt @@ -0,0 +1 @@ +.vs/ \ No newline at end of file diff --git a/Backup/q4sdk.sln b/Backup/q4sdk.sln new file mode 100644 index 000000000..2f4df2a3f --- /dev/null +++ b/Backup/q4sdk.sln @@ -0,0 +1,46 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "game.vcproj", "{49BEC5C6-B964-417A-851E-808886B57430}" + ProjectSection(ProjectDependencies) = postProject + {49BEC5C6-B964-417A-851E-808886B57400} = {49BEC5C6-B964-417A-851E-808886B57400} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "idlib.vcproj", "{49BEC5C6-B964-417A-851E-808886B57400}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPGame", "mpgame.vcproj", "{F2EF9123-B7C3-4F2F-A351-747B595BB534}" + ProjectSection(ProjectDependencies) = postProject + {49BEC5C6-B964-417A-851E-808886B57400} = {49BEC5C6-B964-417A-851E-808886B57400} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + DebugInline = DebugInline + Release = Release + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {49BEC5C6-B964-417A-851E-808886B57430}.Debug.ActiveCfg = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Debug.Build.0 = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline.ActiveCfg = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline.Build.0 = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Release.ActiveCfg = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Release.Build.0 = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Debug.ActiveCfg = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Debug.Build.0 = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline.ActiveCfg = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline.Build.0 = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Release.ActiveCfg = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Release.Build.0 = Release|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug.ActiveCfg = Debug|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug.Build.0 = Debug|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline.ActiveCfg = DebugInline|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline.Build.0 = DebugInline|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release.ActiveCfg = Release|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 000000000..15f949749 --- /dev/null +++ b/UpgradeLog.htm @@ -0,0 +1,363 @@ + + + + Migration Report +

+ Migration Report - q4sdk

Overview

ProjectPathErrorsWarningsMessages
gamegame.vcproj0225
mpgamempgame.vcproj0225
idlibidlib.vcproj0164
Solutionq4sdk.sln012
Gamegame.vcproj000
idLibidlib.vcproj000
MPGamempgame.vcproj000

Solution and projects

game

Message
game.vcproj: + Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are now automatically built with the Manifest Tool. You may need to change your build in order for it to work correctly. For instance, it is recommended that the dependency information contained in any manifest files be converted to "#pragma comment(linker,"<insert dependency here>")" in a header file that is included from your source code. If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line may need to be commented out before the project will build correctly.
game.vcproj: + Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors. Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName). The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &ClassName::MemberFunctionName). If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).
game.vcproj: + This application has been updated to include settings related to the User Account Control (UAC) feature of Windows Vista. By default, when run on Windows Vista with UAC enabled, this application is marked to run with the same privileges as the process that launched it. This marking also disables the application from running with virtualization. You can change UAC related settings from the Property Pages of the project.
game.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
game.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
game.vcproj: + VCWebServiceProxyGeneratorTool is no longer supported. The tool has been removed from your project settings.
game.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
game.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
game.vcproj: + The C/C++ compiler switch /Og has been deprecated and has been removed from your project settings. It is recommended that you use /O1 or /O2 instead.
game.vcproj: + VCConvertEngine could not convert attribute GlobalOptimizations = TRUE under Tool VCCLCompilerTool.
game.vcproj: + VCConvertEngine could not convert attribute OptimizeForProcessor = 3 under Tool VCCLCompilerTool.
game.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
game.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\Game.dll') does not match the Librarian's OutputFile property value '../Win32/DebugInline\Game.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\Game.dll') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
game.vcproj: + MSB8012: $(TargetName) ('Game') does not match the Linker's OutputFile property value '../Win32/DebugInline\Gamex86.dll' ('Gamex86') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\Game.dll') does not match the Linker's OutputFile property value '../Win32/DebugInline\Gamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\Gamex86.dll') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\Game.dll') does not match the Librarian's OutputFile property value '../Win32/Debug\Game.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\Game.dll') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
game.vcproj: + MSB8012: $(TargetName) ('Game') does not match the Linker's OutputFile property value '../Win32/Debug\Gamex86.dll' ('Gamex86') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\Game.dll') does not match the Linker's OutputFile property value '../Win32/Debug\Gamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\Gamex86.dll') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\Game.dll') does not match the Librarian's OutputFile property value '../Win32/Release\Game.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\Game.dll') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
game.vcproj: + MSB8012: $(TargetName) ('Game') does not match the Linker's OutputFile property value '../Win32/Release\Gamex86.dll' ('Gamex86') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
game.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\Game.dll') does not match the Linker's OutputFile property value '../Win32/Release\Gamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\Gamex86.dll') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
+ Show 5 additional messages +
game.vcproj: + Converting project file 'C:\Users\gamel\Game-Mod-Q4\game.vcproj'.
game.vcproj: + Visual C++ now provides improved safety in its C and C++ Libraries. This includes new and improved functions, additional checking and validation, and internal design changes. These libraries are turned on by default. You may see some warnings about unsafe functions or parameters when you build your project. The warnings will generally suggest an alternative safer coding style or function. It is advised that you correct these warnings, in order to make your code more safe. Full details can be found in the documentation by searching for 'Security Enhancements in the CRT' and for 'Checked Iterators'.
game.vcproj: + The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.
game.vcproj: + Web deployment to the local IIS server is no longer supported. The Web Deployment build tool has been removed from your project settings.
game.vcproj: + Done converting to new project file 'C:\Users\gamel\Game-Mod-Q4\game.vcxproj'.
+ Hide 5 additional messages +

mpgame

Message
mpgame.vcproj: + Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are now automatically built with the Manifest Tool. You may need to change your build in order for it to work correctly. For instance, it is recommended that the dependency information contained in any manifest files be converted to "#pragma comment(linker,"<insert dependency here>")" in a header file that is included from your source code. If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line may need to be commented out before the project will build correctly.
mpgame.vcproj: + Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors. Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName). The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &ClassName::MemberFunctionName). If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).
mpgame.vcproj: + This application has been updated to include settings related to the User Account Control (UAC) feature of Windows Vista. By default, when run on Windows Vista with UAC enabled, this application is marked to run with the same privileges as the process that launched it. This marking also disables the application from running with virtualization. You can change UAC related settings from the Property Pages of the project.
mpgame.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
mpgame.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
mpgame.vcproj: + VCWebServiceProxyGeneratorTool is no longer supported. The tool has been removed from your project settings.
mpgame.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
mpgame.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
mpgame.vcproj: + The C/C++ compiler switch /Og has been deprecated and has been removed from your project settings. It is recommended that you use /O1 or /O2 instead.
mpgame.vcproj: + VCConvertEngine could not convert attribute GlobalOptimizations = TRUE under Tool VCCLCompilerTool.
mpgame.vcproj: + VCConvertEngine could not convert attribute OptimizeForProcessor = 3 under Tool VCCLCompilerTool.
mpgame.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
mpgame.vcproj: + VCConvertEngine could not convert attribute MapLines = FALSE under Tool VCLinkerTool.
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\MPGame.dll') does not match the Librarian's OutputFile property value '../Win32/DebugInline\MPGame.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\MPGame.dll') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetName) ('MPGame') does not match the Linker's OutputFile property value '../Win32/DebugInline\MPGamex86.dll' ('MPGamex86') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\MPGame.dll') does not match the Linker's OutputFile property value '../Win32/DebugInline\MPGamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\MPGamex86.dll') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\MPGame.dll') does not match the Librarian's OutputFile property value '../Win32/Debug\MPGame.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\MPGame.dll') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetName) ('MPGame') does not match the Linker's OutputFile property value '../Win32/Debug\MPGamex86.dll' ('MPGamex86') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\MPGame.dll') does not match the Linker's OutputFile property value '../Win32/Debug\MPGamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\MPGamex86.dll') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\MPGame.dll') does not match the Librarian's OutputFile property value '../Win32/Release\MPGame.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\MPGame.dll') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetName) ('MPGame') does not match the Linker's OutputFile property value '../Win32/Release\MPGamex86.dll' ('MPGamex86') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetName) property value matches the value specified in %(Link.OutputFile).
mpgame.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\MPGame.dll') does not match the Linker's OutputFile property value '../Win32/Release\MPGamex86.dll' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\MPGamex86.dll') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
+ Show 5 additional messages +
mpgame.vcproj: + Converting project file 'C:\Users\gamel\Game-Mod-Q4\mpgame.vcproj'.
mpgame.vcproj: + Visual C++ now provides improved safety in its C and C++ Libraries. This includes new and improved functions, additional checking and validation, and internal design changes. These libraries are turned on by default. You may see some warnings about unsafe functions or parameters when you build your project. The warnings will generally suggest an alternative safer coding style or function. It is advised that you correct these warnings, in order to make your code more safe. Full details can be found in the documentation by searching for 'Security Enhancements in the CRT' and for 'Checked Iterators'.
mpgame.vcproj: + The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.
mpgame.vcproj: + Web deployment to the local IIS server is no longer supported. The Web Deployment build tool has been removed from your project settings.
mpgame.vcproj: + Done converting to new project file 'C:\Users\gamel\Game-Mod-Q4\mpgame.vcxproj'.
+ Hide 5 additional messages +

idlib

Message
idlib.vcproj: + Due to the requirement that Visual C++ projects produce an embedded (by default) Windows SxS manifest, manifest files in the project are now automatically built with the Manifest Tool. You may need to change your build in order for it to work correctly. For instance, it is recommended that the dependency information contained in any manifest files be converted to "#pragma comment(linker,"<insert dependency here>")" in a header file that is included from your source code. If your project already embeds a manifest in the RT_MANIFEST resource section through a resource (.rc) file, the line may need to be commented out before the project will build correctly.
idlib.vcproj: + Due to a conformance change in the C++ compiler, code change may be required before your project will build without errors. Previous versions of the C++ compiler allowed specification of member function pointers by member function name (e.g. MemberFunctionName). The C++ standard requires a fully qualified name with the use of the address-of operator (e.g. &ClassName::MemberFunctionName). If your project contains forms or controls used in the Windows Forms Designer, you may have to change code in InitializeComponent because the designer generated code used the non-conformant syntax in delegate construction (used in event handlers).
idlib.vcproj: + This application has been updated to include settings related to the User Account Control (UAC) feature of Windows Vista. By default, when run on Windows Vista with UAC enabled, this application is marked to run with the same privileges as the process that launched it. This marking also disables the application from running with virtualization. You can change UAC related settings from the Property Pages of the project.
idlib.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
idlib.vcproj: + VCWebServiceProxyGeneratorTool is no longer supported. The tool has been removed from your project settings.
idlib.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
idlib.vcproj: + The C/C++ compiler switch /Og has been deprecated and has been removed from your project settings. It is recommended that you use /O1 or /O2 instead.
idlib.vcproj: + VCConvertEngine could not convert attribute GlobalOptimizations = TRUE under Tool VCCLCompilerTool.
idlib.vcproj: + VCConvertEngine could not convert attribute OptimizeForProcessor = 3 under Tool VCCLCompilerTool.
idlib.vcproj: + Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\idLib.lib') does not match the Librarian's OutputFile property value '../Win32/DebugInline\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\idLib.lib') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\DebugInline\idLib.lib') does not match the Linker's OutputFile property value '../Win32/DebugInline\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/DebugInline\idLib.lib') in project configuration 'DebugInline|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\idLib.lib') does not match the Librarian's OutputFile property value '../Win32/Debug\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\idLib.lib') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Debug\idLib.lib') does not match the Linker's OutputFile property value '../Win32/Debug\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Debug\idLib.lib') in project configuration 'Debug|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\idLib.lib') does not match the Librarian's OutputFile property value '../Win32/Release\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\idLib.lib') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Lib.OutputFile).
idlib.vcproj: + MSB8012: $(TargetPath) ('C:\Users\gamel\Win32\Release\idLib.lib') does not match the Linker's OutputFile property value '../Win32/Release\idLib.lib' ('C:\Users\gamel\Game-Mod-Q4\../Win32/Release\idLib.lib') in project configuration 'Release|Win32'. This may cause your project to build incorrectly. To correct this, please make sure that $(TargetPath) property value matches the value specified in %(Link.OutputFile).
+ Show 4 additional messages +
idlib.vcproj: + Converting project file 'C:\Users\gamel\Game-Mod-Q4\idlib.vcproj'.
idlib.vcproj: + Visual C++ now provides improved safety in its C and C++ Libraries. This includes new and improved functions, additional checking and validation, and internal design changes. These libraries are turned on by default. You may see some warnings about unsafe functions or parameters when you build your project. The warnings will generally suggest an alternative safer coding style or function. It is advised that you correct these warnings, in order to make your code more safe. Full details can be found in the documentation by searching for 'Security Enhancements in the CRT' and for 'Checked Iterators'.
idlib.vcproj: + The C/C++ compiler default settings have been modified to be more compliant with ISO Standard C++. Included in those changes are enforcing Standard C++ for loop scoping and supporting wchar_t as a native type. These changes may cause existing code to no longer compile without changes to the code or the compiler options with which it is built.
idlib.vcproj: + Done converting to new project file 'C:\Users\gamel\Game-Mod-Q4\idlib.vcxproj'.
+ Hide 4 additional messages +

Solution

Message
q4sdk.sln: + Visual Studio needs to make non-functional changes to this project in order to enable the project to open in released versions of Visual Studio newer than Visual Studio 2010 SP1 without impacting project behavior.
+ Show 2 additional messages +
q4sdk.sln: + File successfully backed up as C:\Users\gamel\Game-Mod-Q4\Backup\q4sdk.sln
q4sdk.sln: + Solution migrated successfully
+ Hide 2 additional messages +

Game

Message
Game logged no messages. +

idLib

Message
idLib logged no messages. +

MPGame

Message
MPGame logged no messages. +
\ No newline at end of file diff --git a/game.vcxproj b/game.vcxproj new file mode 100644 index 000000000..7e1961503 --- /dev/null +++ b/game.vcxproj @@ -0,0 +1,496 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + 17.0 + Game + {49BEC5C6-B964-417A-851E-808886B57430} + Game + Perforce Project + + .. + MSSCCI:NXN alienbrain + Win32Proj + + + + DynamicLibrary + v143 + false + MultiByte + + + DynamicLibrary + v143 + false + MultiByte + + + DynamicLibrary + v143 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.35707.178 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + true + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + + + + Disabled + _DEBUG;_WINDOWS;GAME_DLL;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + $(IntDir)$(ProjectName)/ + Level4 + EditAndContinue + Default + + + /FIXED:no %(AdditionalOptions) + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\game\game.def + true + $(IntDir)$(ProjectName)x86.pdb + false + + false + NotSet + 16000000 + 16000000 + true + 0x20000000 + MachineX86 + + + + + Disabled + OnlyExplicitInline + _DEBUG;_WINDOWS;_INLINEDEBUG;GAME_DLL;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + true + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\game\game.def + true + $(IntDir)$(ProjectName)x86.pdb + false + + false + NotSet + 16000000 + 16000000 + true + 0x20000000 + MachineX86 + + + true + + + + + Full + OnlyExplicitInline + true + Neither + false + NDEBUG;_WINDOWS;_FINAL;GAME_DLL;Q4SDK;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + /MACHINE:I386 /fixed:no %(AdditionalOptions) + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\game\game.def + true + $(IntDir)$(ProjectName)x86.pdb + true + $(IntDir)$(ProjectName)x86.map + true + NotSet + 4194304 + true + true + true + + 0x20000000 + MachineX86 + + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {49bec5c6-b964-417a-851e-808886b57400} + false + + + + + + \ No newline at end of file diff --git a/game.vcxproj.filters b/game.vcxproj.filters new file mode 100644 index 000000000..abf867982 --- /dev/null +++ b/game.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {572fdbfc-af9c-4601-bcae-a5b5e3b92653} + + + {9634f64b-dc37-4618-9033-747c3614fa68} + + + {8440b52e-aa1d-4b14-9ccb-4ac792edb38d} + + + {c4c9c78d-73d7-4959-a12b-7cfef9be2bd2} + + + {aac27563-c5cb-41b8-9645-98a9c29aedd5} + + + {00297e59-05a7-436d-8b37-88c3c047a253} + + + {da4f5d39-04e6-4518-949a-a795bba04005} + + + {8dafac95-5f35-4b28-9359-a6a127bd82ff} + + + {bc4f4fec-a014-4e76-8be0-8474abb910e7} + + + {55a41dc2-6e20-47b8-a451-e9211907888d} + + + {8dcc91a2-a9ce-431d-bbd4-b6fd9d8e3aeb} + + + {b3323746-6db8-4605-8964-76be403de897} + + + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\Anim + + + Game\Anim + + + Game\Anim + + + Game\Anim + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Player + + + Game\Player + + + Game\Player + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP\Stats + + + Game\MP\Stats + + + Game\MP\Stats + + + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\Anim + + + Game\Anim + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Player + + + Game\Player + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Weapon + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP\Stats + + + Game\MP\Stats + + + Game\MP\Stats + + + + + + \ No newline at end of file diff --git a/game.vcxproj.user b/game.vcxproj.user new file mode 100644 index 000000000..88a550947 --- /dev/null +++ b/game.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/game/gamesys/Class.cpp b/game/gamesys/Class.cpp index 51cae34e6..ddc796b82 100644 --- a/game/gamesys/Class.cpp +++ b/game/gamesys/Class.cpp @@ -11,7 +11,7 @@ instancing of objects. #include "../Game_local.h" #ifdef _WIN32 -#include "TypeInfo.h" +#include "TypeInfo" #else #include "NoGameTypeInfo.h" #endif diff --git a/game/gamesys/SaveGame.cpp b/game/gamesys/SaveGame.cpp index 28d501df8..080834f90 100644 --- a/game/gamesys/SaveGame.cpp +++ b/game/gamesys/SaveGame.cpp @@ -5,7 +5,7 @@ #include "../Game_local.h" #ifdef _WIN32 -#include "TypeInfo.h" +#include "TypeInfo" #else #include "NoGameTypeInfo.h" #endif diff --git a/game/gamesys/SysCmds.cpp b/game/gamesys/SysCmds.cpp index ab92878fd..6a1d6f231 100644 --- a/game/gamesys/SysCmds.cpp +++ b/game/gamesys/SysCmds.cpp @@ -26,7 +26,7 @@ // RAVEN END #ifdef _WIN32 -#include "TypeInfo.h" +#include "TypeInfo" #else #include "NoGameTypeInfo.h" #endif @@ -171,7 +171,7 @@ void Cmd_ListSpawnArgs_f( const idCmdArgs &args ) { for ( i = 0; i < ent->spawnArgs.GetNumKeyVals(); i++ ) { const idKeyValue *kv = ent->spawnArgs.GetKeyVal( i ); - gameLocal.Printf( "\"%s\" "S_COLOR_WHITE"\"%s\"\n", kv->GetKey().c_str(), kv->GetValue().c_str() ); + gameLocal.Printf( "\"%s\" " S_COLOR_WHITE "\"%s\"\n", kv->GetKey().c_str(), kv->GetValue().c_str() ); } } diff --git a/game/weapon/WeaponBlaster.cpp b/game/weapon/WeaponBlaster.cpp index e6c182b31..3b56f8d37 100644 --- a/game/weapon/WeaponBlaster.cpp +++ b/game/weapon/WeaponBlaster.cpp @@ -431,7 +431,7 @@ stateResult_t rvWeaponBlaster::State_Fire ( const stateParms_t& parms ) { PlayEffect ( "fx_chargedflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "chargedfire", parms.blendFrames ); } else { - Attack ( false, 1, spread, 0, 1.0f ); + Attack ( false, 10, 10, 0, 0.2f ); PlayEffect ( "fx_normalflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "fire", parms.blendFrames ); } diff --git a/idlib.vcxproj b/idlib.vcxproj new file mode 100644 index 000000000..34b61e238 --- /dev/null +++ b/idlib.vcxproj @@ -0,0 +1,327 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + 17.0 + idLib + {49BEC5C6-B964-417A-851E-808886B57400} + idLib + Perforce Project + + .. + MSSCCI:NXN alienbrain + Win32Proj + + + + StaticLibrary + v143 + false + MultiByte + + + StaticLibrary + v143 + false + MultiByte + + + StaticLibrary + v143 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.35707.178 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + + + + Disabled + mssdk/include;%(AdditionalIncludeDirectories) + _DEBUG;_WINDOWS;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName).pdb + $(IntDir)$(ProjectName)/ + Level4 + EditAndContinue + Default + + + $(IntDir)$(ProjectName).lib + + + + + Disabled + OnlyExplicitInline + mssdk/include;%(AdditionalIncludeDirectories) + _DEBUG;_WINDOWS;_INLINEDEBUG;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName).pdb + true + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + $(IntDir)$(ProjectName).lib + + + true + + + + + Full + OnlyExplicitInline + true + Neither + false + mssdk/include;%(AdditionalIncludeDirectories) + NDEBUG;_WINDOWS;_FINAL;Q4SDK;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName).pdb + + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + $(IntDir)$(ProjectName).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + + + + + + + + + + + + + + Use + Use + Use + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/idlib.vcxproj.filters b/idlib.vcxproj.filters new file mode 100644 index 000000000..9b087b344 --- /dev/null +++ b/idlib.vcxproj.filters @@ -0,0 +1,467 @@ + + + + + {fa542ac9-8dfb-4613-adbc-d0b35a51380d} + + + {22b97db6-83d0-40f9-939d-e3f01a362241} + + + {ccb17777-132a-4413-a077-3a787277be0c} + + + {274c9184-332b-4677-9c8e-41f162e660d4} + + + {3ad2173e-f85b-4d94-b3b2-6b7f0520082a} + + + {4f15896a-27c4-445d-8ea2-997a5281ee37} + + + {c60e677a-48fb-42cb-8393-54681fde7f67} + + + {4e3ce7b8-59f9-49aa-8a29-eda39827963b} + + + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib\BV + + + idLib\BV + + + idLib\BV + + + idLib\BV + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Containers + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\threads + + + idLib\Algorithms + + + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib + + + idLib\BV + + + idLib\BV + + + idLib\BV + + + idLib\BV + + + idLib\Containers + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Geometry + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Math + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + idLib\Hashing + + + + + idLib + + + \ No newline at end of file diff --git a/idlib.vcxproj.user b/idlib.vcxproj.user new file mode 100644 index 000000000..88a550947 --- /dev/null +++ b/idlib.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/idlib/math/Simd.cpp b/idlib/math/Simd.cpp index 471720aec..f7b2bb1c2 100644 --- a/idlib/math/Simd.cpp +++ b/idlib/math/Simd.cpp @@ -1491,7 +1491,7 @@ void TestMemcpy( void ) { p_simd->Memcpy( test1, test0, 8192 ); for ( j = 0; j < i; j++ ) { if ( test1[j] != test0[j] ) { - idLib::common->Printf( " simd->Memcpy() "S_COLOR_RED"X\n" ); + idLib::common->Printf( " simd->Memcpy() " S_COLOR_RED "X\n" ); return; } } @@ -1517,7 +1517,7 @@ void TestMemset( void ) { p_simd->Memset( test, j, i ); for ( k = 0; k < i; k++ ) { if ( test[k] != (byte)j ) { - idLib::common->Printf( " simd->Memset() "S_COLOR_RED"X\n" ); + idLib::common->Printf( " simd->Memset() " S_COLOR_RED "X\n" ); return; } } diff --git a/mpgame.vcxproj b/mpgame.vcxproj new file mode 100644 index 000000000..cb53fd2e9 --- /dev/null +++ b/mpgame.vcxproj @@ -0,0 +1,491 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + 17.0 + MPGame + {F2EF9123-B7C3-4F2F-A351-747B595BB534} + MPGame + Win32Proj + + + + DynamicLibrary + v143 + false + MultiByte + + + DynamicLibrary + v143 + false + MultiByte + + + DynamicLibrary + v143 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>17.0.35707.178 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + true + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + + + + Disabled + _DEBUG;_WINDOWS;GAME_DLL;GAME_MPAPI;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + $(IntDir)$(ProjectName)/ + Level4 + EditAndContinue + Default + + + /FIXED:no %(AdditionalOptions) + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\mpgame\mpgame.def + true + $(IntDir)$(ProjectName)x86.pdb + false + + false + NotSet + 16000000 + 16000000 + true + 0x20000000 + MachineX86 + + + + + Disabled + OnlyExplicitInline + _DEBUG;_WINDOWS;_INLINEDEBUG;GAME_DLL;GAME_MPAPI;Q4SDK;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + true + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + true + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\mpgame\mpgame.def + true + $(IntDir)$(ProjectName)x86.pdb + false + + false + NotSet + 16000000 + 16000000 + true + 0x20000000 + MachineX86 + + + true + + + + + Full + OnlyExplicitInline + true + Neither + false + NDEBUG;_WINDOWS;_FINAL;GAME_DLL;GAME_MPAPI;Q4SDK;%(PreprocessorDefinitions) + true + MultiThreaded + false + false + true + true + Use + + $(IntDir)$(ProjectName)/$(ProjectName).pch + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)/ + $(IntDir)$(ProjectName)x86.pdb + + $(IntDir)$(ProjectName)/ + Level4 + ProgramDatabase + Default + + + /MACHINE:I386 /fixed:no %(AdditionalOptions) + $(IntDir)idLib.lib;%(AdditionalDependencies) + $(IntDir)$(ProjectName)x86.dll + true + .\mpgame\mpgame.def + true + $(IntDir)$(ProjectName)x86.pdb + true + $(IntDir)$(ProjectName)x86.map + true + NotSet + 4194304 + true + true + true + + 0x20000000 + MachineX86 + + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {49bec5c6-b964-417a-851e-808886b57400} + false + + + + + + \ No newline at end of file diff --git a/mpgame.vcxproj.filters b/mpgame.vcxproj.filters new file mode 100644 index 000000000..bb3bd04aa --- /dev/null +++ b/mpgame.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {e9d107ee-5e98-48ed-a545-39b8f2a0a50b} + + + {539ac8ec-7b44-4e0d-9a7c-44208ddf7b0b} + + + {6f4c6b1e-493a-40ac-8cdf-07b48ddb55c4} + + + {c91bde56-d230-4282-9a30-6ef14f975cc9} + + + {3b103764-fc0e-4214-84cf-9280436f6632} + + + {488b386e-03ec-422d-8d71-1a369d388b8f} + + + {006718a6-a8dd-4462-bf4b-3574eae4d2b6} + + + {09d031c6-8b25-42e2-a074-7e0ea65a373e} + + + {03dc8fe1-56ec-400c-9781-29283331845b} + + + {8e6849d4-da8d-433a-b17c-c54b2d53f193} + + + {bd2618c3-461f-4b10-94f0-6953554b170f} + + + {0efd66a2-caca-4ac8-a854-33e345c47b01} + + + {71f5c2c1-64cc-4b04-bb4c-e3967eb0d0c5} + + + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\Anim + + + Game\Anim + + + Game\Anim + + + Game\Anim + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Player + + + Game\Player + + + Game\Player + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\Weapon + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP\Stats + + + Game\MP\Stats + + + Game\MP\Stats + + + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\AI + + + Game\Anim + + + Game\Anim + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\Client + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\GameSys + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Physics + + + Game\Player + + + Game\Player + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Script + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Vehicle + + + Game\Weapon + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP + + + Game\MP\Stats + + + Game\MP\Stats + + + Game\MP\Stats + + + + + + \ No newline at end of file diff --git a/mpgame.vcxproj.user b/mpgame.vcxproj.user new file mode 100644 index 000000000..88a550947 --- /dev/null +++ b/mpgame.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/q4sdk.sln b/q4sdk.sln index 2f4df2a3f..7691119c0 100644 --- a/q4sdk.sln +++ b/q4sdk.sln @@ -1,46 +1,40 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "game.vcproj", "{49BEC5C6-B964-417A-851E-808886B57430}" - ProjectSection(ProjectDependencies) = postProject - {49BEC5C6-B964-417A-851E-808886B57400} = {49BEC5C6-B964-417A-851E-808886B57400} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35707.178 d17.12 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "game.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57430}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "idlib.vcproj", "{49BEC5C6-B964-417A-851E-808886B57400}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "idLib", "idlib.vcxproj", "{49BEC5C6-B964-417A-851E-808886B57400}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPGame", "mpgame.vcproj", "{F2EF9123-B7C3-4F2F-A351-747B595BB534}" - ProjectSection(ProjectDependencies) = postProject - {49BEC5C6-B964-417A-851E-808886B57400} = {49BEC5C6-B964-417A-851E-808886B57400} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MPGame", "mpgame.vcxproj", "{F2EF9123-B7C3-4F2F-A351-747B595BB534}" EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - DebugInline = DebugInline - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + DebugInline|x86 = DebugInline|x86 + Release|x86 = Release|x86 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {49BEC5C6-B964-417A-851E-808886B57430}.Debug.ActiveCfg = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Debug.Build.0 = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline.ActiveCfg = DebugInline|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline.Build.0 = DebugInline|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Release.ActiveCfg = Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57430}.Release.Build.0 = Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.Debug.ActiveCfg = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.Debug.Build.0 = Debug|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline.ActiveCfg = DebugInline|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline.Build.0 = DebugInline|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.Release.ActiveCfg = Release|Win32 - {49BEC5C6-B964-417A-851E-808886B57400}.Release.Build.0 = Release|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug.ActiveCfg = Debug|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug.Build.0 = Debug|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline.ActiveCfg = DebugInline|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline.Build.0 = DebugInline|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release.ActiveCfg = Release|Win32 - {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {49BEC5C6-B964-417A-851E-808886B57430}.Debug|x86.ActiveCfg = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Debug|x86.Build.0 = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline|x86.ActiveCfg = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.DebugInline|x86.Build.0 = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Release|x86.ActiveCfg = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57430}.Release|x86.Build.0 = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Debug|x86.ActiveCfg = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Debug|x86.Build.0 = Debug|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline|x86.ActiveCfg = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.DebugInline|x86.Build.0 = DebugInline|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Release|x86.ActiveCfg = Release|Win32 + {49BEC5C6-B964-417A-851E-808886B57400}.Release|x86.Build.0 = Release|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug|x86.ActiveCfg = Debug|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Debug|x86.Build.0 = Debug|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline|x86.ActiveCfg = DebugInline|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.DebugInline|x86.Build.0 = DebugInline|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release|x86.ActiveCfg = Release|Win32 + {F2EF9123-B7C3-4F2F-A351-747B595BB534}.Release|x86.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal From dab95e9d9354a49b48090f48d819fc911e05779b Mon Sep 17 00:00:00 2001 From: wowzersdude Date: Fri, 7 Feb 2025 22:23:34 -0500 Subject: [PATCH 3/3] Modified rocket launcher (number of fires) --- game/weapon/WeaponBlaster.cpp | 2 +- game/weapon/WeaponRocketLauncher.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/weapon/WeaponBlaster.cpp b/game/weapon/WeaponBlaster.cpp index 3b56f8d37..61e6a9bef 100644 --- a/game/weapon/WeaponBlaster.cpp +++ b/game/weapon/WeaponBlaster.cpp @@ -431,7 +431,7 @@ stateResult_t rvWeaponBlaster::State_Fire ( const stateParms_t& parms ) { PlayEffect ( "fx_chargedflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "chargedfire", parms.blendFrames ); } else { - Attack ( false, 10, 10, 0, 0.2f ); + Attack ( false, 10, spread, 0, 0.2f ); PlayEffect ( "fx_normalflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "fire", parms.blendFrames ); } diff --git a/game/weapon/WeaponRocketLauncher.cpp b/game/weapon/WeaponRocketLauncher.cpp index bbd362379..454f4ccb5 100644 --- a/game/weapon/WeaponRocketLauncher.cpp +++ b/game/weapon/WeaponRocketLauncher.cpp @@ -167,7 +167,7 @@ void rvWeaponRocketLauncher::Think ( void ) { // If the rocket is still guiding then stop the guide and slow it down if ( proj->GetGuideType ( ) != idGuidedProjectile::GUIDE_NONE ) { proj->CancelGuide ( ); - proj->SetSpeed ( guideSpeedFast, (1.0f - (proj->GetSpeed ( ) - guideSpeedSlow) / (guideSpeedFast - guideSpeedSlow)) * guideAccelTime ); + proj->SetSpeed ( guideSpeedFast, (1.0f - (proj->GetSpeed ( ) - guideSpeedSlow) / (guideSpeedFast - guideSpeedSlow)) * guideAccelTime * 5.5f ); } } @@ -446,7 +446,7 @@ stateResult_t rvWeaponRocketLauncher::State_Fire ( const stateParms_t& parms ) { switch ( parms.stage ) { case STAGE_INIT: nextAttackTime = gameLocal.time + (fireRate * owner->PowerUpModifier ( PMOD_FIRERATE )); - Attack ( false, 1, spread, 0, 1.0f ); + Attack ( false, 3, spread, 0, 1.0f ); PlayAnim ( ANIMCHANNEL_LEGS, "fire", parms.blendFrames ); return SRESULT_STAGE ( STAGE_WAIT );