improved how quiver ifdefs are handled.

Author: Bitl

src/game/client/client_quiver.vpc

@@ -29,7 +29,7 @@ $Configuration
 		$PreprocessorDefinitions		"$BASE;SIXENSE" [!$SOURCESDK]
 		$PreprocessorDefinitions		"$BASE;DISABLE_GC_CONNECTION;DISABLE_IN_SOURCESDK;INVENTORY_VIA_WEBAPI" [$SOURCESDK]
 		//custom options
-		$PreprocessorDefinitions		"$BASE;QUIVER_CLIENT_DLL;BDSBASE_DISCORD;BDSBASE_USE_LOCAL_SCHEMA;BDSBASE_CUSTOM_SCHEMA;BDSBASE_LEGACY_MAINMENU;BDSBASE_CURATED_ITEMS;BDSBASE_LEGACY_VIEWMODELS;BDSBASE_CURATED_ITEMS_ALLOWCOSMETICS;BDSBASE_ACHIEVEMENT_NOTIFICATIONS"
+		$PreprocessorDefinitions		"$BASE;QUIVER_DLL;BDSBASE_DISCORD;BDSBASE_USE_LOCAL_SCHEMA;BDSBASE_CUSTOM_SCHEMA;BDSBASE_LEGACY_MAINMENU;BDSBASE_CURATED_ITEMS;BDSBASE_LEGACY_VIEWMODELS;BDSBASE_CURATED_ITEMS_ALLOWCOSMETICS;BDSBASE_ACHIEVEMENT_NOTIFICATIONS"
 	}
 }
 

src/game/client/econ/backpack_panel.cpp

@@ -1141,7 +1141,7 @@ void CBackpackPanel::AssignItemToPanel( CItemModelPanel *pPanel, int iIndex )
 					pItemDef = mapItems[it];
 				}
 
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 				if (mapItems[it]->IsSoloItem())
 				{
 					tempItem.Init(pItemDef->GetDefinitionIndex(), AE_CUSTOMIZED, AE_USE_SCRIPT_VALUE, true);

src/game/client/tf/c_obj_sentrygun.cpp

@@ -196,7 +196,7 @@ void C_ObjectSentrygun::OnDataChanged( DataUpdateType_t updateType )
 
 	if ( m_nShieldLevel != m_nOldShieldLevel || m_bRecreateShield )
 	{
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 		if ( m_nShieldLevel > SHIELD_DISABLE )
 #else
 		if ( m_nShieldLevel > 0 )

src/game/client/tf/c_obj_sentrygun.h

@@ -23,7 +23,7 @@ class C_MuzzleFlashModel;
 enum
 {
 	SHIELD_NONE = 0,
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	SHIELD_DISABLE,
 #endif
 	SHIELD_NORMAL,	// 33% damage taken

src/game/client/tf/c_tf_player.cpp

@@ -3981,7 +3981,7 @@ IMPLEMENT_CLIENTCLASS_DT( C_TFPlayer, DT_TFPlayer, CTFPlayer )
 	RecvPropInt(RECVINFO(m_nRestrictAchievements)),
 	RecvPropInt(RECVINFO(m_nRestrictQuests)),
 #endif
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	RecvPropInt(RECVINFO(m_ArmorValue)),
 	RecvPropInt(RECVINFO(m_iMaxArmor)),
 #endif
@@ -4005,7 +4005,7 @@ BEGIN_PREDICTION_DATA( C_TFPlayer )
 	DEFINE_PRED_FIELD( m_flVehicleReverseTime, FIELD_FLOAT, FTYPEDESC_INSENDTABLE ),
 	DEFINE_PRED_FIELD( m_flInspectTime, FIELD_FLOAT, FTYPEDESC_INSENDTABLE ),
 	DEFINE_PRED_FIELD( m_flHelpmeButtonPressTime, FIELD_FLOAT, FTYPEDESC_INSENDTABLE ),
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	DEFINE_PRED_FIELD(m_ArmorValue, FIELD_INTEGER, FTYPEDESC_INSENDTABLE | FTYPEDESC_ONLY_ERROR_IF_ABOVE_ZERO_TO_ZERO_OR_BELOW_ETC),
 #endif
 END_PREDICTION_DATA()
@@ -4147,7 +4147,7 @@ C_TFPlayer::C_TFPlayer() :
 	m_flNeckScale = 1.f;
 #endif
 
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	m_ArmorValue = 0.0f;
 #endif
 
@@ -8127,7 +8127,7 @@ void C_TFPlayer::AddDecal( const Vector& rayStart, const Vector& rayEnd,
 		g_pEffects->Ricochet( rayEnd - (vecDir * 8), -vecDir );
 		return;
 	}
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	else if (ArmorValue() > 0)
 	{
 		// Armor also ricochets.

src/game/client/tf/c_tf_player.h

@@ -545,7 +545,7 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 
 	bool	IsPlayerOnSteamFriendsList( C_BasePlayer *pPlayer );
 
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	int		ArmorValue(void) { return m_ArmorValue; }
 	int		GetMaxArmor(void) { return m_iMaxArmor; }
 #endif
@@ -738,7 +738,7 @@ class C_TFPlayer : public C_BasePlayer, public IHasAttributes, public IInventory
 	float			m_flTauntStartTime;
 	float			m_flTauntDuration;
 
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	int				m_ArmorValue;
 	int				m_iMaxArmor;
 #endif

src/game/client/tf/tf_fx_blood.cpp

@@ -39,7 +39,7 @@ void TFBloodSprayCallback( Vector vecOrigin, Vector vecNormal, ClientEntityHandl
 		bUnderwater = true;
 	}
 
-#ifdef QUIVER_CLIENT_DLL
+#ifdef QUIVER_DLL
 	if (pPlayer && pPlayer->ArmorValue() > 0)
 	{
 		//we don't bleed if we have armor, however, armor penetration will be represented by blood on the walls

src/game/client/tf/tf_hud_account.cpp

@@ -160,7 +160,7 @@ static const hitsound_params_t g_HitSounds[] =
 	hitsound_params_t( "Player.HitSoundBeepo",				1,			255 ),
 	hitsound_params_t( "Player.HitSoundVortex",				1,			255 ),
 	hitsound_params_t( "Player.HitSoundSquasher",			1,			255 ),
-#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#if defined(QUIVER_DLL)
 	hitsound_params_t("Player.HitSoundQuake",				1,			255),
 #endif
 };
@@ -176,7 +176,7 @@ static const hitsound_params_t g_LastHitSounds[] =
 	hitsound_params_t( "Player.KillSoundBeepo", 1, 255 ),
 	hitsound_params_t( "Player.KillSoundVortex", 1, 255 ),
 	hitsound_params_t( "Player.KillSoundSquasher", 1, 255 ),
-#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#if defined(QUIVER_DLL)
 	//quake has no defined kill sound.
 	hitsound_params_t( "Player.HitSoundQuake",				1,			255),
 #endif

src/game/client/tf/tf_hud_itemeffectmeter.cpp

@@ -24,7 +24,7 @@
 #ifdef BDSBASE
 #include "tf_weapon_dragons_fury.h"
 #endif
-#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#if defined(QUIVER_DLL)
 #include "tf_weapon_bottle.h"
 #endif
 #include "tf_weapon_knife.h"
@@ -304,7 +304,7 @@ void CHudItemEffectMeter::CreateHudElementsForClass( C_TFPlayer* pPlayer, CUtlVe
 	}
 	case TF_CLASS_DEMOMAN:
 		DECLARE_ITEM_EFFECT_METER( CTFSword, TF_WEAPON_SWORD, false, "resource/UI/HudItemEffectMeter_Demoman.res" );
-#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#if defined(QUIVER_DLL)
 		DECLARE_ITEM_EFFECT_METER(CTFStickBomb, TF_WEAPON_STICKBOMB, true, "resource/UI/HudItemEffectMeter_Stickbomb.res" );
 #endif
 		break;

src/game/client/tf/tf_hud_match_status.cpp

@@ -30,7 +30,7 @@
 extern ConVar mp_winlimit;
 extern ConVar mp_tournament_stopwatch;
 
-#if defined(QUIVER_DLL) || defined(QUIVER_CLIENT_DLL)
+#if defined(QUIVER_DLL)
 ConVar tf_use_match_hud( "tf_use_match_hud", "0", FCVAR_DEVELOPMENTONLY );
 #else
 ConVar tf_use_match_hud( "tf_use_match_hud", "1", FCVAR_ARCHIVE );