Merging a bunch of random stuff from old repos

.github/workflows/pipeline.yml

@@ -186,7 +186,7 @@ jobs:
         run: |
           cp -r valve/game/jbmod game/jbmod_base
           cp -r game/jbmod/* game/jbmod_base/
-          vpk-ctrl -b game/jbmod_base game/jbmod_base/*.cfg game/jbmod_base/*.txt !game/jbmod_base/gameinfo.txt !game/jbmod_base/steam.inf game/jbmod_base/cfg !game/jbmod_base/cfg/*_example.txt !game/jbmod_base/cfg/settings.scr game/jbmod_base/maps !game/jbmod_base/maps/*.bsp game/jbmod_base/materials game/jbmod_base/media game/jbmod_base/models game/jbmod_base/resource !game/jbmod_base/resource/*.ico !game/jbmod_base/resource/*.ttf game/jbmod_base/scripts game/jbmod_base/servers game/jbmod_base/sound > pak01.vdf
+          vpk-ctrl -b game/jbmod_base game/jbmod_base/*.cfg game/jbmod_base/*.txt !game/jbmod_base/gameinfo.txt !game/jbmod_base/steam.inf game/jbmod_base/cfg !game/jbmod_base/cfg/autoexec.cfg !game/jbmod_base/cfg/*_example.txt !game/jbmod_base/cfg/settings.scr game/jbmod_base/maps !game/jbmod_base/maps/*.bsp game/jbmod_base/materials game/jbmod_base/media game/jbmod_base/models game/jbmod_base/resource !game/jbmod_base/resource/*.ico !game/jbmod_base/resource/*.ttf game/jbmod_base/scripts game/jbmod_base/servers game/jbmod_base/sound > pak01.vdf
           vpk -M -P -K privatekey.vdf -k publickey.vdf k game/jbmod_base/jbmod_pak pak01.vdf
           cp pak01.vdf pak01.vdf.bak
           vpk-cleaner -c pak01.vdf game/jbmod_base game/jbmod_clean

game/jbmod/cfg/autoexec.cfg

@@ -3,4 +3,4 @@ sv_allowdownload "0"
 cl_allowupload "0"
 cl_allowdownload "0"
 cl_downloadfilter "mapsonly"
-cl_playerspraydisable "1"
+cl_spraydisable "1"

game/jbmod/resource/clientscheme.res

@@ -1273,7 +1273,7 @@ Scheme
 		"7"		"resource/linux_fonts/DejaVuSans-BoldOblique.ttf"
 		"8"		"resource/linux_fonts/DejaVuSans-Oblique.ttf"
 		"9"		"resource/linux_fonts/LiberationSans-Regular.ttf"
-		"10"		"resource/linux_fonts/LiberationSans-Bold.ttf"
+		"10"	"resource/linux_fonts/LiberationSans-Bold.ttf"
 		"11"	"resource/linux_fonts/LiberationMono-Regular.ttf"
 
 		"12"	"resource/GorDIN-Regular.ttf"

game/jbmod/scripts/vscripts/gamemodes/sandbox.nut

@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-printl( "Initializing Sandbox Game Mode..." );
+printl( "Initializing Sandbox..." );
 SetGameDescription( "JBMod Sandbox" );
 Convars.SetValue( "sv_infinite_aux_power", 1 );
+Convars.SetValue( "mp_falldamage", 1 );
 
 function OnPlayerSpawn( player )
 {

game/jbmod/scripts/weapon_alyxgun.txt

@@ -0,0 +1,63 @@
+// Alyx Gun
+
+WeaponData
+{
+	// Weapon data is loaded by both the Game and Client DLLs.
+	"printname"	"#HL2_AlyxGun"
+	"viewmodel"				"models/weapons/W_Alyx_Gun.mdl"
+	"playermodel"			"models/weapons/W_Alyx_Gun.mdl"	//FIXME: 
+	"anim_prefix"			"alyxgun"
+	"bucket"				"1"
+	"bucket_position"		"4"
+
+	"clip_size"				"30"
+	"clip2_size"			"-1"
+
+	"default_clip"			"30"
+	"default_clip2"			"-1"
+
+	"primary_ammo"			"AlyxGun"
+
+	"weight"				"2"
+	"item_flags"			"0"
+
+	// Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds)
+	SoundData
+	{
+
+		"reload"		"Weapon_Alyx_Gun.Reload"
+		"reload_npc"	"Weapon_Alyx_Gun.NPC_Reload"
+		"empty"			"Weapon_Alyx_Gun.Empty"
+		"single_shot"	"Weapon_Alyx_Gun.Single"
+		"single_shot_npc"	"Weapon_Alyx_Gun.NPC_Single"
+		"special1"		"Weapon_Alyx_Gun.Special1"
+		"special2"		"Weapon_Alyx_Gun.Special2"
+		"burst"			"Weapon_Alyx_Gun.Burst"
+	}
+
+	// Weapon Sprite data is loaded by the Client DLL.
+	TextureData
+	{
+		"ammo"
+		{
+				"font"		"WeaponIconsSmall"
+				"character"	"p"
+		}
+		"crosshair"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+		"autoaim"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+	}
+}

game/jbmod/scripts/weapon_citizenpackage.txt

@@ -0,0 +1,67 @@
+// Citizen package. Not really a weapon, just needs to be a visible model for citizens to open.
+
+WeaponData
+{
+	// Weapon data is loaded by both the Game and Client DLLs.
+	"printname"	"#HL2_CitizenPackage"
+	"viewmodel"			"models/weapons/w_package.mdl"
+	"playermodel"			"models/weapons/w_package.mdl"
+	"anim_prefix"			"smg2"
+	"bucket"				"5"
+	"bucket_position"		"18"
+
+	"clip_size"				"-1"
+	"clip2_size"			"-1"
+
+	"default_clip"			"-1"
+	"default_clip2"			"-1"
+
+	"primary_ammo"			"None"
+	"secondary_ammo"		"None"
+
+	"weight"				"0"
+	"item_flags"			"0"
+
+	// Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds)
+	SoundData
+	{
+	}
+
+	// Weapon Sprite data is loaded by the Client DLL.
+	TextureData
+	{
+		"weapon"
+		{
+				"font"		"WeaponIcons"
+				"character"	"b"
+		}
+		"weapon_s"
+		{	
+				"font"		"WeaponIconsSelected"
+				"character"	"b"
+		}
+		"weapon_small"
+		{
+				"font"		"WeaponIconsSmall"
+				"character"	"b"
+		}
+		"ammo"
+		{
+				"font"		"WeaponIconsSmall"
+				"character"	"s"
+		}
+		"crosshair"
+		{
+				"font"		"Crosshairs"
+				"character"	"Q"
+		}
+		"autoaim"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+	}
+}

game/jbmod/scripts/weapon_citizensuitcase.txt

@@ -0,0 +1,67 @@
+// Citizen package. Not really a weapon, just needs to be a visible model for citizens to open.
+
+WeaponData
+{
+	// Weapon data is loaded by both the Game and Client DLLs.
+	"printname"	"#HL2_CitizenSuitcase"
+	"viewmodel"			"models/weapons/w_suitcase_passenger.mdl"
+	"playermodel"			"models/weapons/w_suitcase_passenger.mdl"
+	"anim_prefix"			"smg2"
+	"bucket"				"5"
+	"bucket_position"		"17"
+
+	"clip_size"				"-1"
+	"clip2_size"			"-1"
+
+	"default_clip"			"-1"
+	"default_clip2"			"-1"
+
+	"primary_ammo"			"None"
+	"secondary_ammo"		"None"
+
+	"weight"				"0"
+	"item_flags"			"0"
+
+	// Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds)
+	SoundData
+	{
+	}
+
+	// Weapon Sprite data is loaded by the Client DLL.
+	TextureData
+	{
+		"weapon"
+		{
+				"font"		"WeaponIcons"
+				"character"	"b"
+		}
+		"weapon_s"
+		{	
+				"font"		"WeaponIconsSelected"
+				"character"	"b"
+		}
+		"weapon_small"
+		{
+				"font"		"WeaponIconsSmall"
+				"character"	"b"
+		}
+		"ammo"
+		{
+				"font"		"WeaponIconsSmall"
+				"character"	"s"
+		}
+		"crosshair"
+		{
+				"font"		"Crosshairs"
+				"character"	"Q"
+		}
+		"autoaim"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+	}
+}

game/jbmod/scripts/weapon_oldmanharpoon.txt

@@ -0,0 +1,72 @@
+WeaponData
+{
+	// Weapon data is loaded by both the Game and Client DLLs.
+	"printname"	"#HL2_SMG1"
+	"viewmodel"			"models/lostcoast/fisherman/harpoon.mdl"
+	"playermodel"			"models/lostcoast/fisherman/harpoon.mdl"
+	"anim_prefix"			"smg2"
+	"bucket"				"2"
+	"bucket_position"		"0"
+
+	"clip_size"				"-1"
+	"clip2_size"			"-1"
+
+	"default_clip"			"-1"
+	"default_clip2"			"-1"
+
+	"primary_ammo"			"None"
+	"secondary_ammo"		"None"
+
+	"weight"				"0"
+	"item_flags"			"0"
+
+	// Sounds for the weapon. There is a max of 16 sounds per category (i.e. max 16 "single_shot" sounds)
+	SoundData
+	{
+	}
+
+	// Weapon Sprite data is loaded by the Client DLL.
+	TextureData
+	{
+		"weapon"
+		{
+				"file"		"sprites/w_icons1"
+				"x"			"128"
+				"y"			"128"
+				"width"		"128"
+				"height"	"64"
+		}
+		"weapon_s"
+		{
+				"file"		"sprites/w_icons1b"
+				"x"			"128"
+				"y"			"128"
+				"width"		"128"
+				"height"	"64"
+		}
+		"ammo"
+		{
+				"file"		"sprites/a_icons1"
+				"x"			"55"
+				"y"			"60"
+				"width"		"73"
+				"height"	"15"
+		}
+		"crosshair"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+		"autoaim"
+		{
+				"file"		"sprites/crosshairs"
+				"x"			"0"
+				"y"			"48"
+				"width"		"24"
+				"height"	"24"
+		}
+	}
+}

src/game/client/c_baseentity.cpp

@@ -1962,6 +1962,9 @@ int C_BaseEntity::DrawBrushModel( bool bDrawingTranslucency, int nFlags, bool bT
 	// Identity brushes are drawn in view->DrawWorld as an optimization
 	Assert ( modelinfo->GetModelType( model ) == mod_brush );
 
+	if ( !render )
+		return 0;
+
 	ERenderDepthMode DepthMode = DEPTH_MODE_NORMAL;
 	if ( ( nFlags & STUDIO_SSAODEPTHTEXTURE ) != 0 )
 	{

src/game/client/c_baseplayer.cpp

@@ -2892,6 +2892,16 @@ bool C_BasePlayer::GetSteamID( CSteamID *pID )
 	return false;
 }
 
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+const Vector& C_BasePlayer::GetRenderOrigin(void)
+{
+	if ( IsInAVehicle() )
+		InvalidateBoneCache();
+	return BaseClass::GetRenderOrigin();
+}
+
 #if defined USES_ECON_ITEMS
 //-----------------------------------------------------------------------------
 // Purpose: Update the visibility of our worn items.

src/game/client/c_baseplayer.h

@@ -83,6 +83,8 @@ class C_BasePlayer : public C_BaseCombatCharacter, public CGameEventListener
 	virtual void	SharedSpawn(); // Shared between client and server.
 	virtual bool	GetSteamID( CSteamID *pID );
 
+	virtual const Vector& GetRenderOrigin();
+
 	// IClientEntity overrides.
 	virtual void	OnPreDataChanged( DataUpdateType_t updateType );
 	virtual void	OnDataChanged( DataUpdateType_t updateType );

src/game/client/c_prop_vehicle.cpp

@@ -203,6 +203,7 @@ void C_PropVehicleDriveable::DampenEyePosition( Vector &vecVehicleEyePos, QAngle
 //-----------------------------------------------------------------------------
 void C_PropVehicleDriveable::GetVehicleViewPosition( int nRole, Vector *pAbsOrigin, QAngle *pAbsAngles, float *pFOV /*=NULL*/ )
 {
+	if ( !m_hPlayer->IsLocalPlayer() ) return;
 	SharedVehicleViewSmoothing( m_hPlayer,
 								pAbsOrigin, pAbsAngles,
 								m_bEnterAnimOn, m_bExitAnimOn,

src/game/client/c_vehicle_choreo_generic.cpp

@@ -206,6 +206,7 @@ int	C_PropVehicleChoreoGeneric::GetPassengerRole( C_BaseCombatCharacter *pPassen
 //-----------------------------------------------------------------------------
 void C_PropVehicleChoreoGeneric::GetVehicleViewPosition( int nRole, Vector *pAbsOrigin, QAngle *pAbsAngles, float *pFOV /*=NULL*/ )
 {
+	if ( !m_hPlayer->IsLocalPlayer() ) return;
 	SharedVehicleViewSmoothing( m_hPlayer, 
 								pAbsOrigin, pAbsAngles, 
 								m_bEnterAnimOn, m_bExitAnimOn, 

src/game/client/c_vehicle_jeep.cpp

@@ -144,9 +144,11 @@ void C_PropJeep::DampenEyePosition( Vector &vecVehicleEyePos, QAngle &vecVehicle
 		return;
 	}
 
+#ifndef JBMOD
 	// Keep static the sideways motion.
 	// Dampen forward/backward motion.
 	DampenForwardMotion( vecVehicleEyePos, vecVehicleEyeAngles, flFrameTime );
+#endif
 
 	// Blend up/down motion.
 	DampenUpMotion( vecVehicleEyePos, vecVehicleEyeAngles, flFrameTime );