Skip to content

Commit f30eac7

Browse files
BitlBitl
committed
Revert "Implement ValveSoftware#974"
This reverts commit 077f599.
1 parent 0d3848e commit f30eac7

File tree

11 files changed

+1
-179
lines changed

11 files changed

+1
-179
lines changed

‎src/game/client/hud.cpp‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,6 @@ void CHud::LevelInit( void )
533533
group->bHidden = false;
534534
group->m_pLockingElements.Purge();
535535
}
536-
537-
#ifdef BDSBASE
538-
RefreshHudTextures();
539-
#endif
540536
}
541537

542538
//-----------------------------------------------------------------------------
@@ -805,11 +801,7 @@ CHudTexture *CHud::GetIcon( const char *szIcon )
805801
//-----------------------------------------------------------------------------
806802
// Purpose:
807803
//-----------------------------------------------------------------------------
808-
#ifdef BDSBASE
809-
void CHud::RefreshHudTextures(const char* customKillIconFile /* = "\0" */)
810-
#else
811804
void CHud::RefreshHudTextures()
812-
#endif
813805
{
814806
if ( !m_bHudTexturesLoaded )
815807
{
@@ -819,20 +811,6 @@ void CHud::RefreshHudTextures()
819811

820812
CUtlDict< CHudTexture *, int > textureList;
821813

822-
#ifdef BDSBASE
823-
// loading custom kill icons, presumably packed into the map and because of an input to the gamerules entity
824-
if (FStrEq(customKillIconFile, "") == false)
825-
{
826-
LoadHudTextures(textureList, customKillIconFile, NULL);
827-
int co = textureList.Count();
828-
for (int index = 0; index < co; index++)
829-
{
830-
CHudTexture* tex = textureList[index];
831-
AddSearchableHudIconToList(*tex);
832-
}
833-
}
834-
#endif
835-
836814
// check to see if we have sprites for this res; if not, step down
837815
LoadHudTextures( textureList, "scripts/hud_textures", NULL );
838816
LoadHudTextures( textureList, "scripts/mod_textures", NULL );

‎src/game/client/hud.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,7 @@ class CHud
144144
CHudTexture *AddUnsearchableHudIconToList( CHudTexture& texture );
145145
CHudTexture *AddSearchableHudIconToList( CHudTexture& texture );
146146

147-
#ifdef BDSBASE
148-
void RefreshHudTextures(const char* customKillIconFile = "\0");
149-
#else
150147
void RefreshHudTextures();
151-
#endif
152148

153149
// User messages
154150
void MsgFunc_ResetHUD(bf_read &msg);

‎src/game/server/pointhurt.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ BEGIN_DATADESC( CPointHurt )
2222
DEFINE_KEYFIELD( m_flDelay, FIELD_FLOAT, "DamageDelay" ),
2323
DEFINE_KEYFIELD( m_bitsDamageType, FIELD_INTEGER, "DamageType" ),
2424
DEFINE_KEYFIELD( m_strTarget, FIELD_STRING, "DamageTarget" ),
25-
#ifdef BDSBASE
26-
#ifdef TF_DLL
27-
DEFINE_KEYFIELD(m_szKillIcon, FIELD_STRING, "KillIcon"),
28-
#endif // TF_DLL
29-
#endif
3025

3126
// Function Pointers
3227
DEFINE_FUNCTION( HurtThink ),

‎src/game/server/pointhurt.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,4 @@ class CPointHurt : public CPointEntity
2727
float m_flDelay;
2828
string_t m_strTarget;
2929
EHANDLE m_pActivator;
30-
31-
#ifdef BDSBASE
32-
#ifdef TF_DLL
33-
string_t m_szKillIcon;
34-
#endif // TF_DLL
35-
#endif
3630
};

‎src/game/server/tf/func_croc.cpp‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ LINK_ENTITY_TO_CLASS( func_croc, CFuncCroc );
1818

1919
BEGIN_DATADESC( CFuncCroc )
2020
DEFINE_KEYFIELD( m_iszModel, FIELD_STRING, "croc_model" ),
21-
#ifdef BDSBASE
22-
DEFINE_KEYFIELD(m_iszKillIcon, FIELD_STRING, "killicon"),
23-
#endif
2421
// Outputs
2522
DEFINE_OUTPUT( m_OnEat, "OnEat" ),
2623
DEFINE_OUTPUT( m_OnEatRed, "OnEatRed" ),
@@ -106,9 +103,6 @@ void CEntityCroc::Think( void )
106103
CFuncCroc::CFuncCroc()
107104
{
108105
m_iszModel = NULL_STRING;
109-
#ifdef BDSBASE
110-
m_iszKillIcon = NULL_STRING;
111-
#endif
112106
}
113107

114108
//-----------------------------------------------------------------------------
@@ -214,16 +208,4 @@ const char *CFuncCroc::GetCrocModel( void )
214208
}
215209

216210
return CROC_MODEL;
217-
}
218-
219-
#ifdef BDSBASE
220-
//-----------------------------------------------------------------------------
221-
// Purpose:
222-
//-----------------------------------------------------------------------------
223-
const char* CFuncCroc::GetKillIcon(void)
224-
{
225-
if (m_iszKillIcon != NULL_STRING)
226-
return (STRING(m_iszKillIcon));
227-
return "crocodile";
228-
}
229-
#endif
211+
}

‎src/game/server/tf/func_croc.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,10 @@ class CFuncCroc : public CBaseTrigger
5050

5151
const char *GetCrocModel( void );
5252

53-
#ifdef BDSBASE
54-
const char* GetKillIcon(void);
55-
#endif
56-
5753
private:
5854

5955
string_t m_iszModel;
6056

61-
#ifdef BDSBASE
62-
string_t m_iszKillIcon;
63-
#endif
64-
6557
COutputEvent m_OnEat;
6658
COutputEvent m_OnEatRed;
6759
COutputEvent m_OnEatBlue;

‎src/game/server/triggers.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -666,11 +666,6 @@ BEGIN_DATADESC( CTriggerHurt )
666666
DEFINE_KEYFIELD( m_bitsDamageInflict, FIELD_INTEGER, "damagetype" ),
667667
DEFINE_KEYFIELD( m_damageModel, FIELD_INTEGER, "damagemodel" ),
668668
DEFINE_KEYFIELD( m_bNoDmgForce, FIELD_BOOLEAN, "nodmgforce" ),
669-
#ifdef BDSBASE
670-
#ifdef TF_DLL
671-
DEFINE_KEYFIELD(m_szKillIcon, FIELD_STRING, "killicon"),
672-
#endif // TF_DLL
673-
#endif
674669

675670
DEFINE_FIELD( m_flLastDmgTime, FIELD_TIME ),
676671
DEFINE_FIELD( m_flDmgResetTime, FIELD_TIME ),

‎src/game/server/triggers.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@ class CTriggerHurt : public CTriggerHurtShim, public ITriggerHurtAutoList
211211
int m_damageModel;
212212
bool m_bNoDmgForce; // Should damage from this trigger impart force on what it's hurting
213213

214-
#ifdef BDSBASE
215-
#ifdef TF_DLL
216-
string_t m_szKillIcon;
217-
#endif // TF_DLL
218-
#endif
219-
220214
enum
221215
{
222216
DAMAGEMODEL_NORMAL = 0,

‎src/game/shared/teamplayroundbased_gamerules.cpp‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ BEGIN_NETWORK_TABLE_NOBASE( CTeamplayRoundBasedRules, DT_TeamplayRoundBasedRules
103103
RecvPropBool( RECVINFO( m_bCheatsEnabledDuringLevel ) ),
104104
RecvPropTime( RECVINFO( m_flCountdownTime ) ),
105105
RecvPropTime( RECVINFO( m_flStateTransitionTime ) ),
106-
#ifdef BDSBASE
107-
RecvPropString(RECVINFO(m_pszCustomKillIconsFile)),
108-
#endif
109106
#else
110107
SendPropInt( SENDINFO( m_iRoundState ), 5 ),
111108
SendPropBool( SENDINFO( m_bInWaitingForPlayers ) ),
@@ -126,9 +123,6 @@ BEGIN_NETWORK_TABLE_NOBASE( CTeamplayRoundBasedRules, DT_TeamplayRoundBasedRules
126123
SendPropBool( SENDINFO( m_bCheatsEnabledDuringLevel ) ),
127124
SendPropTime( SENDINFO( m_flCountdownTime ) ),
128125
SendPropTime( SENDINFO( m_flStateTransitionTime ) ),
129-
#ifdef BDSBASE
130-
SendPropString(SENDINFO(m_pszCustomKillIconsFile)),
131-
#endif
132126
#endif
133127
END_NETWORK_TABLE()
134128

@@ -179,9 +173,6 @@ END_SEND_TABLE()
179173
BEGIN_DATADESC( CTeamplayRoundBasedRulesProxy )
180174
// Inputs.
181175
DEFINE_INPUTFUNC( FIELD_BOOLEAN, "SetStalemateOnTimelimit", InputSetStalemateOnTimelimit ),
182-
#ifdef BDSBASE
183-
DEFINE_INPUTFUNC(FIELD_STRING, "SetCustomKillIconsFile", InputSetCustomKillIconsFile),
184-
#endif
185176
END_DATADESC()
186177

187178
//-----------------------------------------------------------------------------
@@ -191,16 +182,6 @@ void CTeamplayRoundBasedRulesProxy::InputSetStalemateOnTimelimit( inputdata_t &i
191182
{
192183
TeamplayRoundBasedRules()->SetStalemateOnTimelimit( inputdata.value.Bool() );
193184
}
194-
195-
#ifdef BDSBASE
196-
//-----------------------------------------------------------------------------
197-
// Purpose:
198-
//-----------------------------------------------------------------------------
199-
void CTeamplayRoundBasedRulesProxy::InputSetCustomKillIconsFile(inputdata_t& inputdata)
200-
{
201-
TeamplayRoundBasedRules()->SetCustomKillIconsFile(inputdata.value.String());
202-
}
203-
#endif
204185
#endif
205186

206187
#ifdef GAME_DLL
@@ -547,10 +528,6 @@ CTeamplayRoundBasedRules::CTeamplayRoundBasedRules( void )
547528

548529
m_hWaitingForPlayersTimer = NULL;
549530
m_bStopWatchShouldBeTimedWin = false;
550-
#else // GAME_DLL
551-
#ifdef BDSBASE
552-
V_strncpy(m_pszOldCustomKillIconsFile, "", MAX_PATH);
553-
#endif
554531
#endif
555532
}
556533

@@ -603,13 +580,6 @@ void CTeamplayRoundBasedRules::AddTeamRespawnWaveTime( int iTeam, float flValue
603580

604581
m_TeamRespawnWaveTimes.Set( iTeam, flNewValue );
605582
}
606-
607-
#ifdef BDSBASE
608-
void CTeamplayRoundBasedRules::SetCustomKillIconsFile(const char* pszCustomKillIconsFile)
609-
{
610-
V_StripExtension(pszCustomKillIconsFile, m_pszCustomKillIconsFile.GetForModify(), MAX_PATH);
611-
}
612-
#endif
613583
#endif
614584

615585
//-----------------------------------------------------------------------------
@@ -3820,14 +3790,6 @@ void CTeamplayRoundBasedRules::OnDataChanged( DataUpdateType_t updateType )
38203790
{
38213791
HandleOvertimeBegin();
38223792
}
3823-
3824-
#ifdef BDSBASE
3825-
if (!FStrEq(m_pszOldCustomKillIconsFile, m_pszCustomKillIconsFile))
3826-
{
3827-
V_strncpy(m_pszOldCustomKillIconsFile, m_pszCustomKillIconsFile, MAX_PATH);
3828-
gHUD.RefreshHudTextures(GetCustomKillIconsFile());
3829-
}
3830-
#endif
38313793
}
38323794
#endif // CLIENT_DLL
38333795

‎src/game/shared/teamplayroundbased_gamerules.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ class CTeamplayRoundBasedRulesProxy : public CGameRulesProxy
143143
#ifdef GAME_DLL
144144
DECLARE_DATADESC();
145145
void InputSetStalemateOnTimelimit( inputdata_t &inputdata );
146-
#ifdef BDSBASE
147-
void InputSetCustomKillIconsFile(inputdata_t& inputdata);
148-
#endif
149146
#endif
150147

151148
//----------------------------------------------------------------------------------
@@ -376,10 +373,6 @@ class CTeamplayRoundBasedRules : public CTeamplayRules, public CGameEventListene
376373

377374
void SetStalemateOnTimelimit( bool bStalemate ) { m_bAllowStalemateAtTimelimit = bStalemate; }
378375

379-
#ifdef BDSBASE
380-
void SetCustomKillIconsFile(const char* pszCustomKillIconsFile);
381-
#endif
382-
383376
bool IsGameUnderTimeLimit( void );
384377

385378
void HandleTimeLimitChange( void );
@@ -576,9 +569,6 @@ class CTeamplayRoundBasedRules : public CTeamplayRules, public CGameEventListene
576569
bool m_bOldInWaitingForPlayers;
577570
bool m_bOldInOvertime;
578571
bool m_bOldInSetup;
579-
#ifdef BDSBASE
580-
char m_pszOldCustomKillIconsFile[MAX_PATH];
581-
#endif
582572
#endif // CLIENT_DLL
583573

584574
public:
@@ -587,9 +577,6 @@ class CTeamplayRoundBasedRules : public CTeamplayRules, public CGameEventListene
587577
virtual bool HaveCheatsBeenEnabledDuringLevel( void ) { return m_bCheatsEnabledDuringLevel; }
588578

589579
float GetPreroundCountdownTime( void ){ return m_flCountdownTime; }
590-
#ifdef BDSBASE
591-
const char* GetCustomKillIconsFile() { return m_pszCustomKillIconsFile.Get(); }
592-
#endif
593580

594581
protected:
595582
CNetworkVar( gamerules_roundstate_t, m_iRoundState );
@@ -613,9 +600,6 @@ class CTeamplayRoundBasedRules : public CTeamplayRules, public CGameEventListene
613600
CNetworkVar( int, m_nRoundsPlayed );
614601
CNetworkVar( float, m_flCountdownTime );
615602
CNetworkVar( float, m_flStateTransitionTime ); // Timer for round states
616-
#ifdef BDSBASE
617-
CNetworkString(m_pszCustomKillIconsFile, MAX_PATH);
618-
#endif
619603
public:
620604
CNetworkArray( float, m_TeamRespawnWaveTimes, MAX_TEAMS_ARRAY_SAFE ); // Time between each team's respawn wave
621605

0 commit comments

Comments
 (0)