diff --git a/.vs/Game-Mod-Q4/v16/.suo b/.vs/Game-Mod-Q4/v16/.suo new file mode 100644 index 00000000..1dbc721d Binary files /dev/null and b/.vs/Game-Mod-Q4/v16/.suo differ diff --git a/.vs/Game-Mod-Q4/v16/Browse.VC.db b/.vs/Game-Mod-Q4/v16/Browse.VC.db new file mode 100644 index 00000000..1d67585e Binary files /dev/null and b/.vs/Game-Mod-Q4/v16/Browse.VC.db differ diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json new file mode 100644 index 00000000..0cf5ea50 --- /dev/null +++ b/.vs/ProjectSettings.json @@ -0,0 +1,3 @@ +{ + "CurrentProjectSetting": "No Configurations" +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 00000000..6b611411 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,6 @@ +{ + "ExpandedNodes": [ + "" + ], + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/.vs/q4sdk/v16/.suo b/.vs/q4sdk/v16/.suo new file mode 100644 index 00000000..245d0817 Binary files /dev/null and b/.vs/q4sdk/v16/.suo differ diff --git a/.vs/q4sdk/v16/Browse.VC.db b/.vs/q4sdk/v16/Browse.VC.db new file mode 100644 index 00000000..0638f3be Binary files /dev/null and b/.vs/q4sdk/v16/Browse.VC.db differ diff --git a/.vs/q4sdk/v16/Solution.VC.db b/.vs/q4sdk/v16/Solution.VC.db new file mode 100644 index 00000000..2ffe44bf Binary files /dev/null and b/.vs/q4sdk/v16/Solution.VC.db differ diff --git a/.vs/q4sdk/v16/ipch/2bb907f779dc2004.ipch b/.vs/q4sdk/v16/ipch/2bb907f779dc2004.ipch new file mode 100644 index 00000000..014a752b Binary files /dev/null and b/.vs/q4sdk/v16/ipch/2bb907f779dc2004.ipch differ diff --git a/.vs/q4sdk/v16/ipch/579919214e667295.ipch b/.vs/q4sdk/v16/ipch/579919214e667295.ipch new file mode 100644 index 00000000..e3381794 Binary files /dev/null and b/.vs/q4sdk/v16/ipch/579919214e667295.ipch differ diff --git a/.vs/q4sdk/v16/ipch/c820931f55d4130b.ipch b/.vs/q4sdk/v16/ipch/c820931f55d4130b.ipch new file mode 100644 index 00000000..83b3eb09 Binary files /dev/null and b/.vs/q4sdk/v16/ipch/c820931f55d4130b.ipch differ diff --git a/.vs/q4sdk/v16/ipch/ce0716c466498021.ipch b/.vs/q4sdk/v16/ipch/ce0716c466498021.ipch new file mode 100644 index 00000000..7ffb61e5 Binary files /dev/null and b/.vs/q4sdk/v16/ipch/ce0716c466498021.ipch differ diff --git a/.vs/q4sdk/v16/ipch/f0df877a26f02ec7.ipch b/.vs/q4sdk/v16/ipch/f0df877a26f02ec7.ipch new file mode 100644 index 00000000..c8020adc Binary files /dev/null and b/.vs/q4sdk/v16/ipch/f0df877a26f02ec7.ipch differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 00000000..7a020c96 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/Backup/q4sdk.sln b/Backup/q4sdk.sln new file mode 100644 index 00000000..2f4df2a3 --- /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 00000000..04e62f21 Binary files /dev/null and b/UpgradeLog.htm differ diff --git a/game.vcxproj b/game.vcxproj new file mode 100644 index 00000000..1cfb1cbf --- /dev/null +++ b/game.vcxproj @@ -0,0 +1,504 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + Game + {49BEC5C6-B964-417A-851E-808886B57430} + Game + Perforce Project + + .. + MSSCCI:NXN alienbrain + Win32Proj + + + + DynamicLibrary + v142 + false + MultiByte + + + DynamicLibrary + v142 + false + MultiByte + + + DynamicLibrary + v142 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>16.0.32002.118 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + true + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + MinimumRecommendedRules.ruleset + + + + + + 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 00000000..e0433cde --- /dev/null +++ b/game.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {5dc1230e-197a-4e7f-a7b1-c0a12610ac52} + + + {1d6c79a1-1d74-453c-a183-86458d7cfec1} + + + {70a8a2f3-f495-43bd-aa28-6b89759b2332} + + + {c5e6d72c-7d85-44af-86d2-3d4fb37745f4} + + + {ee7cdb32-71ce-4a03-b7c6-418638f83512} + + + {f29000be-463a-4ab1-ac39-7b4e73bb5209} + + + {7e3c1314-9524-4375-9b4d-81b06fff45e4} + + + {16a7a42a-c753-4b30-b2e0-2a3f4ca20659} + + + {7657f4b6-ebbf-41e5-b845-fae9cfcf8a15} + + + {d5898139-af63-4613-a47f-37ac006738a9} + + + {8c2beb79-a347-47d9-8a6f-ab71a3c7729e} + + + {8d3d6f87-4aeb-4d21-9b7e-c8666ea7dc70} + + + + + 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 00000000..88a55094 --- /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 51cae34e..ddc796b8 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 28d501df..080834f9 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 ab92878f..6a1d6f23 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 e6c182b3..3c3fefa3 100644 --- a/game/weapon/WeaponBlaster.cpp +++ b/game/weapon/WeaponBlaster.cpp @@ -425,13 +425,13 @@ stateResult_t rvWeaponBlaster::State_Fire ( const stateParms_t& parms ) { } - + gameLocal.Printf("something\n"); if ( gameLocal.time - fireHeldTime > chargeTime ) { Attack ( true, 1, spread, 0, 1.0f ); PlayEffect ( "fx_chargedflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "chargedfire", parms.blendFrames ); } else { - Attack ( false, 1, spread, 0, 1.0f ); + Attack ( false, 10, 1.5, 0, 0.2f ); //changed PlayEffect ( "fx_normalflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "fire", parms.blendFrames ); } diff --git a/idlib.vcxproj b/idlib.vcxproj new file mode 100644 index 00000000..35859be8 --- /dev/null +++ b/idlib.vcxproj @@ -0,0 +1,335 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + idLib + {49BEC5C6-B964-417A-851E-808886B57400} + idLib + Perforce Project + + .. + MSSCCI:NXN alienbrain + Win32Proj + + + + StaticLibrary + v142 + false + MultiByte + + + StaticLibrary + v142 + false + MultiByte + + + StaticLibrary + v142 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>16.0.32002.118 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + MinimumRecommendedRules.ruleset + + + + + + 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 00000000..2cb0d5dd --- /dev/null +++ b/idlib.vcxproj.filters @@ -0,0 +1,467 @@ + + + + + {e20427e0-d067-4a69-bef8-8a4b873baa2b} + + + {0a7ff98c-738c-402d-969f-286c3fcc9649} + + + {83ccdacd-bdce-420c-8936-b3bc4e504f4b} + + + {c5db3d5f-678f-49ae-8f3d-3ed0c67c1e7b} + + + {33e6dcea-a637-4818-892f-6cd2cb7c5bde} + + + {b7ff4728-8383-4abe-9b0e-cd0db0808066} + + + {e8d0907e-5c14-4c48-b4a4-f324c93da7d5} + + + {b04314f9-2fb4-45e4-b33c-f14c2a57a996} + + + + + 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 00000000..88a55094 --- /dev/null +++ b/idlib.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/idlib/Str.cpp b/idlib/Str.cpp index 32ede888..a8c0ee02 100644 --- a/idlib/Str.cpp +++ b/idlib/Str.cpp @@ -1,4 +1,4 @@ - + #include "precompiled.h" #pragma hdrstop @@ -69,21 +69,21 @@ const bool idStr::printableCharacter[256] = true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, // p q r s t u v w x y z { | } ~ true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, -// X S C P T C Z C Z P +// € X S C ・P T C Z C Z P true, true, false, false, false, false, false, false, false, false, true, false, true, true, true, true, -// s C P t C z C z P +// ・ s C ・P t C z C z P false, false, false, false, false, false, false, false, false, true, true, false, true, true, true, true, -// P P P +// ｡ ｣ P ､ ･ P ｧ ｩ ｫ ｮ P false, true, false, true, true, true, false, true, false, true, false, true, false, false, true, true, -// P P P +// ｰ ｣ P ｴ ｵ ｷ P ｻ ｿ P true, false, false, true, true, true, false, true, false, true, false, true, false, false, false, true, -// C P C C P C C C +// ﾀ ﾁ C ﾂ ﾃ ﾄ ﾅ ﾆ P ﾇ ﾈ C ﾉ C ﾊ P ﾋ ﾌ C ﾍ C ﾎ ﾏ C true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, -// P C PC C C C C +// ﾐ ﾑ P ﾒ C ﾓ PC ﾔ ﾕ ﾖ ﾗ ﾘ C ﾙ C ﾚ C ﾛ ﾜ ﾝ C ﾞ ﾟ true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, -// C P C C P C C C +// ・ ・C ・ ・ ・ ・ ・P ・ ・C ・C ・P ・ ・C ・C ・ ・C true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, -// P C PC C C C C +// ・ ・P ・C ・PC ・ ・ ・ ・ ・C ・C ・C ・ ・  C   true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, }; @@ -105,22 +105,22 @@ const char idStr::upperCaseCharacter[256] = 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', // p q r s t u v w x y z { | } ~ 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 0, 0, 0, 0, 0, -// X S T Z - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, '', '', '', '', -// TM s t z - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, '', '', '', '', -// - 0, 0, 0, '', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, '', -// - 0, 0, 0, '', 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, '', -// - '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', 0, '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', 0, '', '', '', '', '', '', '', '', +// € X S Œ T Z + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Š', 0, 'Œ', '', 'Ž', 'Ž', +// TM s œ t z + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Š', 0, 'Œ', '', 'Ž', '', +// ｡ ｣ ､ ･ ｧ ｩ ｫ ｮ + 0, 0, 0, '｣', 0, '･', 0, 0, 0, 0, 0, 0, 0, 0, 0, 'ｿ', +// ｰ ｴ ｵ ｷ ｻ ｿ + 0, 0, 0, '｣', 0, 0, 0, 0, 0, '･', 0, 0, 0, 0, 0, 'ｿ', +// ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ + 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', +// ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ﾝ ﾞ ﾟ + 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 0, 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ', +// ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ + 'ﾀ', 'ﾁ', 'ﾂ', 'ﾃ', 'ﾄ', 'ﾅ', 'ﾆ', 'ﾇ', 'ﾈ', 'ﾉ', 'ﾊ', 'ﾋ', 'ﾌ', 'ﾍ', 'ﾎ', 'ﾏ', +// ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・ ・    + 'ﾐ', 'ﾑ', 'ﾒ', 'ﾓ', 'ﾔ', 'ﾕ', 'ﾖ', 0, 'ﾘ', 'ﾙ', 'ﾚ', 'ﾛ', 'ﾜ', 'ﾝ', 'ﾞ', 'ﾟ', }; const char idStr::lowerCaseCharacter[256] = @@ -141,22 +141,22 @@ const char idStr::lowerCaseCharacter[256] = 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', // p q r s t u v w x y z { | } ~ 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0, -// X S T Z - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, '', '', '', '', -// TM s t z - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, '', '', '', '', -// - 0, 0, 0, '', 0, '', 0, 0, 0, 0, 0, 0, 0, 0, 0, '', -// - 0, 0, 0, '', 0, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, '', -// - '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', 0, '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', -// - '', '', '', '', '', '', '', 0, '', '', '', '', '', '', '', '', +// € X S ・ T Z + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'š', 0, 'œ', '', 'ž', 'Ÿ', +// TM s œ t z + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'š', 0, 'œ', '', 'ž', 'Ÿ', +// ¡ £ ¤ ¥ § © « ® + 0, 0, 0, '³', 0, '¹', 0, 0, 0, 0, 0, 0, 0, 0, 0, '¯', +// ° ´ µ · » ¿ + 0, 0, 0, '³', 0, 0, 0, 0, 0, '¹', 0, 0, 0, 0, 0, '¯', +// À Á Â Ã Ä Å Æ Ç È É Ê Ë Ì Í Î Ï + 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', +// Ð Ñ Ò Ó Ô Õ Ö × Ø Ù Ú Û Ü Ý Þ ß + 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 0, 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ß', +// à á â ã ä å æ ç è é ê ë ì í î ï + 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', +// ð ñ ò ó ô õ ö ÷ ø ù ú û ü ý þ ÿ + 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 0, 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ', 'ß', }; // RAVEN END diff --git a/idlib/math/Simd.cpp b/idlib/math/Simd.cpp index 471720ae..f7b2bb1c 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 00000000..069a1006 --- /dev/null +++ b/mpgame.vcxproj @@ -0,0 +1,499 @@ + + + + + DebugInline + Win32 + + + Debug + Win32 + + + Release + Win32 + + + + MPGame + {F2EF9123-B7C3-4F2F-A351-747B595BB534} + MPGame + Win32Proj + + + + DynamicLibrary + v142 + false + MultiByte + + + DynamicLibrary + v142 + false + MultiByte + + + DynamicLibrary + v142 + false + MultiByte + + + + + + + + + + + + + + + + <_ProjectFileVersion>16.0.32002.118 + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + true + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + MinimumRecommendedRules.ruleset + + + + + ../$(Platform)/$(Configuration)\ + $(OutDir) + true + false + MinimumRecommendedRules.ruleset + + + + + + 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 00000000..8bd0ec21 --- /dev/null +++ b/mpgame.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {3f9d6382-9e7d-4e7a-8be3-eaeb14e08c45} + + + {c05e8bf8-35c9-4576-94a4-54e0c870dc3d} + + + {cbac6541-4c68-442a-b0d2-fd938fc583b5} + + + {3e3e170a-59b5-4eb0-ad0f-b8655598cc34} + + + {76030cc9-6ddd-43ce-a3d0-97ede7468871} + + + {276e547b-b690-45cc-9a79-e4c75ad7f5d2} + + + {d05eb94a-42dd-4024-b993-3ea289c4090e} + + + {642371b5-f8f9-41aa-843e-1f4c2b319abe} + + + {4a0d62e0-5da7-4ccc-bd97-21de564437d6} + + + {030ba080-372a-448c-9003-1d8f8676114c} + + + {bfd6f0d3-fc6c-4ee9-b848-7bb39e013908} + + + {7a13ca67-592e-4979-b714-3c59844b0438} + + + {1cdb297e-ef34-449d-9f62-b722e20cab6d} + + + + + 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 00000000..88a55094 --- /dev/null +++ b/mpgame.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/mpgame/Player.cpp b/mpgame/Player.cpp index d48ec86e..67c374cf 100644 --- a/mpgame/Player.cpp +++ b/mpgame/Player.cpp @@ -9662,6 +9662,7 @@ void idPlayer::Think( void ) { inBuyZone = false; inBuyZonePrev = false; + } /* diff --git a/mpgame/Weapon.cpp b/mpgame/Weapon.cpp index 44775d1d..3fbe6600 100644 --- a/mpgame/Weapon.cpp +++ b/mpgame/Weapon.cpp @@ -2830,8 +2830,9 @@ void rvWeapon::Hitscan( const idDict& dict, const idVec3& muzzleOrigin, const id #endif //RAVEN END } - dir.Normalize(); + //------ + dir.Normalize(); gameLocal.HitScan( dict, muzzleOrigin, dir, fxOrigin, owner, false, 1.0f, NULL, areas ); if ( gameLocal.isServer ) { diff --git a/mpgame/gamesys/Class.cpp b/mpgame/gamesys/Class.cpp index 51cae34e..ddc796b8 100644 --- a/mpgame/gamesys/Class.cpp +++ b/mpgame/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/mpgame/gamesys/SaveGame.cpp b/mpgame/gamesys/SaveGame.cpp index b475bc02..17ea6579 100644 --- a/mpgame/gamesys/SaveGame.cpp +++ b/mpgame/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/mpgame/gamesys/SysCmds.cpp b/mpgame/gamesys/SysCmds.cpp index 6521693e..e1a7b326 100644 --- a/mpgame/gamesys/SysCmds.cpp +++ b/mpgame/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/mpgame/weapon/WeaponBlaster.cpp b/mpgame/weapon/WeaponBlaster.cpp index e6c182b3..0ed73ddf 100644 --- a/mpgame/weapon/WeaponBlaster.cpp +++ b/mpgame/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, 20, 1.5, 0, 100.0f ); PlayEffect ( "fx_normalflash", barrelJointView, false ); PlayAnim( ANIMCHANNEL_ALL, "fire", parms.blendFrames ); } diff --git a/q4sdk.sln b/q4sdk.sln index 2f4df2a3..bb2f9583 100644 --- a/q4sdk.sln +++ b/q4sdk.sln @@ -1,46 +1,43 @@ -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 16 +VisualStudioVersion = 16.0.32106.194 +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 + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F700D9E6-91C7-4361-AB17-774F0BD06394} EndGlobalSection EndGlobal