vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Working around a compiler bug in fteqcc (presumably) where for some reason

Browse source 
it allows me to override some fields inside a class, but not PlayerUse().
This commit is contained in:
Marco Cawthorne 2020-11-25 10:32:42 +01:00
parent f72e1b2feb
commit 6073f73979
16 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gs-entbase/server/basemonster.cpp
View file

@ -507,12 +507,6 @@ CBaseMonster::touch(void)
}
}
void
CBaseMonster::PlayerUse(void)
{
}
void
CBaseMonster::Pain(void)
{

1
src/gs-entbase/server/basemonster.h
View file

@ -134,7 +134,6 @@ class CBaseMonster:CBaseEntity
virtual void(void) touch;
virtual void(void) Hide;
virtual void(void) Respawn;
virtual void(void) PlayerUse;
virtual void(void) Pain;
virtual void(void) Death;
virtual void(void) Physics;

2
src/gs-entbase/server/basenpc.cpp
View file

@ -436,7 +436,7 @@ CBaseNPC::Respawn(void)
}
void
CBaseNPC::PlayerUse(void)
CBaseNPC::OnPlayerUse(void)
{
if (m_iFlags & MONSTER_FEAR) {
return;

2
src/gs-entbase/server/basenpc.h
View file

@ -71,7 +71,7 @@ class CBaseNPC:CBaseMonster
virtual void(void) FollowPlayer;
virtual void(void) FollowChain;
virtual void(void) Physics;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) PanicFrame;
virtual void(void) Hide;
virtual void(void) Respawn;

5
src/gs-entbase/server/func_healthcharger.cpp
View file

@ -40,12 +40,12 @@ class func_healthcharger:CBaseTrigger
void(void) func_healthcharger;
virtual void(void) customphysics;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(string, string) SpawnKey;
};
void
func_healthcharger::PlayerUse(void)
func_healthcharger::OnPlayerUse(void)
{
/* let's not let this become too funny... */
if (eActivator.health <= 0)
@ -126,4 +126,5 @@ func_healthcharger::func_healthcharger(void)
SetMovetype(MOVETYPE_PUSH);
SetOrigin(origin);
SetModel(model);
PlayerUse = OnPlayerUse;
}

5
src/gs-entbase/server/func_recharge.cpp
View file

@ -40,11 +40,11 @@ class func_recharge:CBaseTrigger
void(void) func_recharge;
virtual void(void) customphysics;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(string, string) SpawnKey;
};
void func_recharge::PlayerUse(void)
void func_recharge::OnPlayerUse(void)
{
/* let's not let this become too funny... */
if (eActivator.health <= 0) {
@ -129,4 +129,5 @@ void func_recharge::func_recharge(void)
SetMovetype(MOVETYPE_PUSH);
SetOrigin(origin);
SetModel(model);
PlayerUse = OnPlayerUse;
}

5
src/gs-entbase/server/func_rot_button.cpp
View file

@ -67,7 +67,7 @@ class func_rot_button:CBaseTrigger
virtual void(void) TriggerTargets;
virtual void(vector, void()) Rotate;
virtual void(void) TurnToggle;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Respawn;
virtual void(void) Death;
virtual void(void) touch;
@ -116,7 +116,7 @@ func_rot_button::Rotate(vector vecDest, void(void) vFunc)
}
void
func_rot_button::PlayerUse(void)
func_rot_button::OnPlayerUse(void)
{
TurnToggle();
}
@ -162,6 +162,7 @@ func_rot_button::Respawn(void)
SetModel(m_oldModel);
SetOrigin(m_oldOrigin);
SetAngles(m_oldAngle);
PlayerUse = OnPlayerUse;
m_iState = ROTBTNSTATE_OPENED;
think = __NULL__;

5
src/gs-entbase/server/func_tankcontrols.cpp
View file

@ -25,12 +25,12 @@ class func_tankcontrols:CBaseTrigger
{
void(void) func_tankcontrols;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Respawn;
};
void
func_tankcontrols::PlayerUse(void)
func_tankcontrols::OnPlayerUse(void)
{
entity f;
CBaseVehicle tank;
@ -63,6 +63,7 @@ func_tankcontrols::Respawn(void)
SetSolid(SOLID_BSP);
SetModel(m_oldModel);
SetOrigin(m_oldOrigin);
PlayerUse = OnPlayerUse;
#ifdef GS_RENDERFX
SetRenderMode(RM_TRIGGER);

5
src/gs-entbase/server/func_tracktrain.cpp
View file

@ -55,7 +55,7 @@ class func_tracktrain:CBaseVehicle
virtual void(void) CheckPathFW;
virtual void(void) CheckPathRV;
virtual void(void) UpdateAngles;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Realign;
virtual void(void) Respawn;
virtual void(string, string) SpawnKey;
@ -202,7 +202,7 @@ func_tracktrain::customphysics(void)
}
void
func_tracktrain::PlayerUse(void)
func_tracktrain::OnPlayerUse(void)
{
vector matrix;
vector offs;
@ -297,6 +297,7 @@ func_tracktrain::Respawn(void)
think = Realign;
nextthink = time + 0.1f;
PlayerUse = OnPlayerUse;
m_flSpeed = m_flStartSpeed / m_flMaxSpeed;
}

5
src/gs-entbase/server/func_vehicle.cpp
View file

@ -96,7 +96,7 @@ class func_vehicle:CBaseVehicle
virtual void(void) customphysics;
virtual void(void) Respawn;
virtual void(void) Realign;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(string, string) SpawnKey;
};
@ -401,7 +401,7 @@ func_vehicle::customphysics(void)
}
void
func_vehicle::PlayerUse(void)
func_vehicle::OnPlayerUse(void)
{
vector matrix;
vector offs;
@ -497,6 +497,7 @@ func_vehicle::Respawn(void)
m_wlBL.velocity =
m_wlBR.velocity =
velocity = [0,0,0];
PlayerUse = OnPlayerUse;
if (m_eDriver)
PlayerLeave((base_player)m_eDriver);

5
src/gs-entbase/server/momentary_rot_button.cpp
View file

@ -37,7 +37,7 @@ class momentary_rot_button:CBaseMomentary
{
void(void) momentary_rot_button;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) customphysics;
virtual void(void) Respawn;
virtual void(void) SetMovementDirection;
@ -45,7 +45,7 @@ class momentary_rot_button:CBaseMomentary
};
void
momentary_rot_button::PlayerUse(void)
momentary_rot_button::OnPlayerUse(void)
{
if (spawnflags & MRBFL_NOTUSE)
return;
@ -117,6 +117,7 @@ momentary_rot_button::Respawn(void)
SetOrigin(m_oldOrigin);
SetMovementDirection();
SetAngles([0,0,0]);
PlayerUse = OnPlayerUse;
m_vecPos1 = [0,0,0];
m_vecPos2 = m_oldAngle + m_vecMoveDir * m_flDistance;

7
src/server/cstrike/hostage_entity.cpp
View file

@ -83,7 +83,7 @@ class hostage_entity:CBaseNPC
void(void) hostage_entity;
virtual void(void) Respawn;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Pain;
virtual void(void) Death;
virtual int(void) AnimIdle;
@ -110,7 +110,7 @@ hostage_entity::AnimRun(void)
}
void
hostage_entity::PlayerUse(void)
hostage_entity::OnPlayerUse(void)
{
if (eActivator.team == TEAM_T) {
return;
@ -125,7 +125,7 @@ hostage_entity::PlayerUse(void)
m_iUsedOnce = TRUE;
}
CBaseNPC::PlayerUse();
CBaseNPC::OnPlayerUse();
}
void
@ -189,6 +189,7 @@ hostage_entity::Respawn(void)
CBaseNPC::Respawn();
m_iFlags |= MONSTER_CANFOLLOW;
m_iUsedOnce = FALSE;
PlayerUse = OnPlayerUse;
}
void

1
src/server/poke646/gamerules.cpp
View file

@ -197,7 +197,6 @@ HLGameRules::LevelChangeParms(base_player pp)
void
HLGameRules::PlayerConnect(base_player pl)
{
entity a;
bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname));
}

7
src/server/valve/monster_barney.cpp
View file

@ -49,7 +49,7 @@ class monster_barney:CBaseNPC
void(void) monster_barney;
virtual void(void) Respawn;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Pain;
virtual void(void) Death;
virtual int(void) AnimIdle;
@ -115,14 +115,14 @@ monster_barney::AttackRanged(void)
}
void
monster_barney::PlayerUse(void)
monster_barney::OnPlayerUse(void)
{
if (spawnflags & MSF_PREDISASTER) {
Sentence("!BA_POK");
return;
}
CBaseNPC::PlayerUse();
CBaseNPC::OnPlayerUse();
}
void
@ -166,6 +166,7 @@ monster_barney::Respawn(void)
{
CBaseNPC::Respawn();
m_iFlags |= MONSTER_CANFOLLOW;
PlayerUse = OnPlayerUse;
}
void

7
src/server/valve/monster_scientist.cpp
View file

@ -74,7 +74,7 @@ class monster_scientist:CBaseNPC
void(void) monster_scientist;
virtual void(void) Respawn;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Pain;
virtual void(void) Death;
virtual int(void) AnimIdle;
@ -102,14 +102,14 @@ monster_scientist::AnimRun(void)
}
void
monster_scientist::PlayerUse(void)
monster_scientist::OnPlayerUse(void)
{
if (spawnflags & MSF_PREDISASTER) {
Sentence("!SC_POK");
return;
}
CBaseNPC::PlayerUse();
CBaseNPC::OnPlayerUse();
}
void
@ -151,6 +151,7 @@ monster_scientist::Respawn(void)
{
CBaseNPC::Respawn();
m_iFlags |= MONSTER_CANFOLLOW;
PlayerUse = OnPlayerUse;
}
void

5
src/shared/cstrike/item_c4bomb.cpp
View file

@ -31,7 +31,7 @@ class item_c4:CBaseEntity
void(void) item_c4;
virtual float(entity, float) SendEntity;
virtual void(void) ClearProgress;
virtual void(void) PlayerUse;
virtual void(void) OnPlayerUse;
virtual void(void) Logic;
#endif
@ -68,7 +68,7 @@ item_c4::ClearProgress(void)
}
void
item_c4::PlayerUse(void)
item_c4::OnPlayerUse(void)
{
player pl = (player)eActivator;
@ -180,6 +180,7 @@ item_c4::item_c4(void)
SetSize([-6,-6,0], [6,6,6]);
customphysics = Logic;
PlayerUse = OnPlayerUse;
m_flExplodeTime = time + 45.0f;
Sound_Play(this, CHAN_WEAPON, "weapon_c4bomb.plant");