From d2dcd4a642ae29d138bb9e8466451dd9c9849448 Mon Sep 17 00:00:00 2001 From: Ashley Yang Date: Thu, 22 Sep 2022 14:13:01 -0400 Subject: [PATCH 1/2] set up and basic mod --- Backup/q4sdk.sln | 46 ++ UpgradeLog.htm | Bin 0 -> 83318 bytes game.vcxproj | 495 ++++++++++++++++++++ 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 | 3 +- idlib.vcxproj | 326 +++++++++++++ idlib.vcxproj.filters | 467 +++++++++++++++++++ idlib.vcxproj.user | 4 + idlib/math/Simd.cpp | 4 +- mpgame.vcxproj | 490 ++++++++++++++++++++ mpgame.vcxproj.filters | 837 ++++++++++++++++++++++++++++++++++ mpgame.vcxproj.user | 4 + q4sdk.sln | 71 ++- 17 files changed, 3552 insertions(+), 44 deletions(-) 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/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 0000000000000000000000000000000000000000..0fc832226600884f1efb4a8ee668add904c104aa GIT binary patch literal 83318 zcmeI5`*RaXlE?ekyNLTAv~V{t#~NeaFgLSd3!5=uFxbGrGO=O&2HSw;7wq2s>38@2 zR641ymef+qk}|XXHYi5htt86}-&KlW9wwG;Z zTiGw!zh(cLQDRJ=M%K!fvV&|jThZ^eY&ZL$QjKh1zqYcUvy0gkeI~N&*^essR!{fU z&fRP?+tK%`O6}ApS$|i(se7ed@l5{qr0taS>;#tbV6y_e@tG^=ntPuBdOP zSwr>H&zx$ktK5=GTHQvLuMHoiHK6=>C~Xiyqn55e2l#$b=}vWuZTR(g_MfUTC0JL~ z0-WkC{aIIQVGIr3g9{q^gW8*dm#Y;$T^5$%3hp=5)_A4f;dT100`cD~mG*JI6^56y z_W{?;uO0P!R}i1iX0mI?f7i3025OtR08i{5w>TkLV1F|Mwg}$A=$I(56z1xdumrs4 zvISv#UC*Jwb8+Fh3`#Ak+=lKlzq!62XtJtVXV))uy{j=Z+w2Z935hYLKb~!>uffLu zQ7x_LgS=V~P+l3ZC7|C`8??k|tG4ssfqqrE$@u?QVSq7!hY9tY&H`kb%WkL~=L7Hp zD|e!Vs5%Qa)Mpi#2b%%yRGJWeKT3{*XZwzK{MTR{5&0L1_(j-*npZW>kHXYoZFZW$ zrnB;MZ(6@ZjYNIq<_4;lxWjXBL6U)Hs0;g;@HpT}2EVID_nd86gWA;hkiRR4SY?K^{O=e^eN#KOa85J2ezUe>iVdf zZL#;Yt9HYu`Z zu=XPd3}2JAYl~~*D^?RXkH6FFY9pvF!&81+IR)uzmN+){a^Q+0Z?Mk#I3VSEW7jQB z`>uvv=jwLL0SXS*R$i*XxvY-ihPakQ1D$*(cCsQ&yUl2Z+h5gLUY*;_)AC3ZHrgWz z%sy!78~uh~IcmJ+H^*)8c*m+#7I)IZeibKWBK_qB{3?qSjq;uyeq-pxmIAt;@phl$()M z;d4iy!DQpvp`6LBrsgZN+I&S09g-yaoZJ&^u@a|jLv!3bPe_(!wZJ-w-%*0WnY8ZS zWY+pEeJmzsHWQKpi9%VEFtmX`pxTQ_d9{#60rF6u_N-Zw zyuebeCh44K3_oKz9AeAgk{_LUSdAl3O8Znc8hu^DapjgZvhPq=p92p#9rF~fDgny{RccnH-K!GUC*~b7JxI0> z`CjN<+69x$NQ;5vKV|*ln%7HVQ{{2K8MHNddyP;RzX@55$diVm7(fn8_8aM8nPc9b z#W`1k42lp_h7sdwvAmnA^3D0$aQj!y5k9}Ey)BLSg<8hH6 zzy~n>SuHQ72KP`{*-buo{1~2WDk|6MlRdr z@#nEd^;{e|t^e!C_olu+oy?wU%{r-UTQ9#RxjinsaO3Nprl>q6%DmL~-0@wa7*^wn zWc;N1e4(BXg~zwY_ou|M)1v&edUzq&uB-MZS=Nii;w4G5snlazd8Yy83;c zJy5MF^+ayorl5MI`_0hzvRb~Qc|4<9jC4+=Zm6|MwYjWukE@?)Jw4Rld%<+1_MeJo zN9uh`Z62zfSE}Wp|FO0Bad#HO~)a!vtK2}e}lve~T<>v*{BjE{r90?cDXHvhP3gXwo-HQG{ zSNq%geWd&JdPTk5*KiG*j{U}Ur>HCUWyrYpmR2!dF z;)?pcuikD8BJj7U>zAVMLw(;?ji!D-QJ>R-U_aDZSN$#FfcEg&JW*c@8r`<~x~5j1 z>-(mjJXPBd_4|>=u_|~Ui24WmPX-7WxFjei1Kl2|)S}>gD7dgSruFPVeI5w^NVFrh zL9WPKK{P8|y%GegD$^7`@Dl$f7^emAn&A5&7#0Q3ih94Pb|0t@;@#tVvY|VRsxzTp znFVWt@vX{`<2ASUpgi_zTGwU{+46|8+q;EBJ2d-lEEV7N*ujr**-wtY;t87xv?psQ5up z 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 literal 0 HcmV?d00001 diff --git a/game.vcxproj b/game.vcxproj new file mode 100644 index 00000000..128b00bf --- /dev/null +++ b/game.vcxproj @@ -0,0 +1,495 @@ + + + + + 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.32830.301 + + + ../$(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 00000000..3ee69fac --- /dev/null +++ b/game.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {2943c4de-6add-46ac-8c13-c087d3e57ca0} + + + {d370bd3f-07b7-4c06-adb2-380935a6bfe2} + + + {c95c3ffc-0a8b-4ddb-a993-6b5b5c350d09} + + + {70aee079-1c47-4817-9688-7fa132522901} + + + {28b21fc7-d448-4186-939e-fd553e620105} + + + {71d27676-9cf4-43c2-96bf-e537ca20e1bb} + + + {1819dd96-f2ba-4d66-a0c4-3c9e4fbd56d8} + + + {bc5df07a-1146-4d49-bedd-aa0a497cbded} + + + {11ce6134-3981-4a8f-8ad4-fc3d4b66b669} + + + {e9bccc17-7265-4930-8dfa-71291b711677} + + + {97d410b5-b1a8-4ba6-9b86-24824a3afcdc} + + + {0bce03a8-f5ff-4147-9224-fc2f1164a991} + + + + + 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..cbf9643b 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..d3dce331 100644 --- a/game/weapon/WeaponBlaster.cpp +++ b/game/weapon/WeaponBlaster.cpp @@ -431,7 +431,8 @@ 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 ); + //AY change: was Attack ( false, 1, spread, 0, 1.0f ); + Attack(false, 15, spread, 0, 10.0f); 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..aaf3b68c --- /dev/null +++ b/idlib.vcxproj @@ -0,0 +1,326 @@ + + + + + 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.32830.301 + + + ../$(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 00000000..ca3b4640 --- /dev/null +++ b/idlib.vcxproj.filters @@ -0,0 +1,467 @@ + + + + + {dc9f4cf5-c46c-496d-b3d0-6d2bba62d903} + + + {3940f350-75dd-4336-a207-8e63131636e7} + + + {747a27a9-6291-46a5-8c1c-0674f26ce2c2} + + + {89869dd2-269d-4632-8c73-4378d805520b} + + + {305395ce-ce18-450e-8251-ec72f12a01dd} + + + {f6bba42c-f43a-4c00-853c-8bc3d2eaf105} + + + {00b463f4-1caa-44ef-a711-eb3a6696d2d8} + + + {f25ed47b-9b55-48aa-82ce-495e82c7d318} + + + + + 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/math/Simd.cpp b/idlib/math/Simd.cpp index 471720ae..11894ecd 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..8698cd9b --- /dev/null +++ b/mpgame.vcxproj @@ -0,0 +1,490 @@ + + + + + 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.32830.301 + + + ../$(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 00000000..ab79b586 --- /dev/null +++ b/mpgame.vcxproj.filters @@ -0,0 +1,837 @@ + + + + + {bde4155e-1c72-4c3d-ad7b-5b04532aaef4} + + + {13193b7b-7628-4a85-b7a1-d1ed99d12502} + + + {709f4d18-61ff-4f8f-bda0-c2bd28b25af1} + + + {341aa759-8fc9-4f06-ac2b-551b53af38b4} + + + {531ea4a4-0c3f-427f-850d-2094d261eb06} + + + {03be7609-59e4-4d39-ab07-d1f7cf5b849a} + + + {cc339f4d-5aaa-41c9-8058-589f27338082} + + + {252900e8-f2a2-4541-8f62-1a0f63c84bd0} + + + {c367a1a5-b3dc-4ae5-83e5-380d0b116964} + + + {a480320a-6cd9-4c68-a383-c13953d647a9} + + + {69408dd3-293f-49a2-af4d-24bb9045d241} + + + {0ba8cac4-8388-428f-878a-888d0ce0ed92} + + + {69752cd8-f268-45da-9a46-312396937f10} + + + + + 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/q4sdk.sln b/q4sdk.sln index 2f4df2a3..4cf08cfb 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.32901.82 +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 = {321066F1-4172-4BAA-B3C1-E47DAB2BB8D4} EndGlobalSection EndGlobal From 653c779898bbf2c11c6701868ce519c67f1f55ba Mon Sep 17 00:00:00 2001 From: Ashley Yang Date: Wed, 5 Oct 2022 12:16:05 -0400 Subject: [PATCH 2/2] Added some definitions to the UsercmdGen.h file --- framework/UsercmdGen.h | 8 ++++---- game/Player.cpp | 23 +++++++++++++++++++++++ game/vehicle/VehicleParts.cpp | 2 +- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/framework/UsercmdGen.h b/framework/UsercmdGen.h index 3875b9e8..be9d9815 100644 --- a/framework/UsercmdGen.h +++ b/framework/UsercmdGen.h @@ -63,10 +63,10 @@ const int IMPULSE_19 = 19; // show PDA/INV/MAP const int IMPULSE_20 = 20; // toggle team ( toggles ui_team ) const int IMPULSE_21 = 21; // tourney toggle waiting room/spec const int IMPULSE_22 = 22; // spectate -const int IMPULSE_23 = 23; // -const int IMPULSE_24 = 24; // -const int IMPULSE_25 = 25; // -const int IMPULSE_26 = 26; // +const int IMPULSE_23 = 23; // buy merc (top) +const int IMPULSE_24 = 24; // select class 1 +const int IMPULSE_25 = 25; // select class 2 +const int IMPULSE_26 = 26; // select class 3 const int IMPULSE_27 = 27; // const int IMPULSE_28 = 28; // vote yes const int IMPULSE_29 = 29; // vote no diff --git a/game/Player.cpp b/game/Player.cpp index 7f482d0f..e178f619 100644 --- a/game/Player.cpp +++ b/game/Player.cpp @@ -2711,6 +2711,7 @@ void idPlayer::ServerSpectate( bool spectate ) { } /* +* Might need =========== idPlayer::SelectSpawnPoint @@ -8087,6 +8088,7 @@ void idPlayer::SetClipModel( bool forceSpectatorBBox ) { } /* +* Need this ============== idPlayer::EnterVehicle ============== @@ -8364,6 +8366,7 @@ bool idPlayer::AttemptToBuyTeamPowerup( const char* itemName ) } /* +* Might need this ============== idPlayer::AttemptToBuyItem ============== @@ -8550,6 +8553,26 @@ void idPlayer::PerformImpulse( int impulse ) { } break; } + + //case for shop + case IMPULSE_23: { + break; + } + + //case for class 1 + case IMPULSE_24: { + break; + } + + //case for class 2 + case IMPULSE_25: { + break; + } + + //case for class 3 + case IMPULSE_26: { + break; + } case IMPULSE_28: { if ( gameLocal.isClient || entityNumber == gameLocal.localClientNum ) { diff --git a/game/vehicle/VehicleParts.cpp b/game/vehicle/VehicleParts.cpp index ae41c387..ef79df24 100644 --- a/game/vehicle/VehicleParts.cpp +++ b/game/vehicle/VehicleParts.cpp @@ -1630,7 +1630,7 @@ void rvVehicleTurret::RunPostPhysics ( void ) { static_cast(position->GetPart(soundPart))->Attenuate ( f, f ); } } - + //*NEED THIS* // Rotate the turret with the mouse parent->GetAnimator()->SetJointAxis( joint, JOINTMOD_LOCAL, mat[YAW] * mat[PITCH] * mat[ROLL] );