nuclide-ports/tfc
nuclide-ports
/
tfc
3
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity

Adjust naming against upstream.

This commit is contained in:
Marco Cawthorne 2022-05-11 12:50:59 -07:00
parent fa69bd0d83
commit 95bd976b58
Signed by: eukara
GPG Key ID: C196CD8BA993248A
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/gamerules.h
View File

@ -18,11 +18,11 @@ class TFCGameRules:CGameRules
{ {
void(void) TFCGameRules; void(void) TFCGameRules;
virtual void(base_player) PlayerConnect; virtual void(NSClientPlayer) PlayerConnect;
virtual void(base_player) PlayerDisconnect; virtual void(NSClientPlayer) PlayerDisconnect;
virtual void(base_player) PlayerPostFrame; virtual void(NSClientPlayer) PlayerPostFrame;
virtual void(base_player) PlayerSpawn; virtual void(NSClientPlayer) PlayerSpawn;
virtual void(base_player) PlayerKill; virtual void(NSClientPlayer) PlayerKill;
virtual void(void) LevelNewParms; virtual void(void) LevelNewParms;
}; };

10
src/server/gamerules.qc
View File

@ -19,7 +19,7 @@ var int autocvar_sv_playerkeepalive = TRUE;
/* we check what fields have changed over the course of the frame and network /* we check what fields have changed over the course of the frame and network
* only the ones that have actually changed */ * only the ones that have actually changed */
void void
TFCGameRules::PlayerPostFrame(base_player pp) TFCGameRules::PlayerPostFrame(NSClientPlayer pp)
{ {
} }
@ -35,14 +35,14 @@ TFCGameRules::LevelNewParms(void)
} }
void void
TFCGameRules::PlayerConnect(base_player pl) TFCGameRules::PlayerConnect(NSClientPlayer pl)
{ {
if (Plugin_PlayerConnect(pl) == FALSE) if (Plugin_PlayerConnect(pl) == FALSE)
bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname)); bprint(PRINT_HIGH, sprintf("%s connected\n", pl.netname));
} }
void void
TFCGameRules::PlayerDisconnect(base_player pl) TFCGameRules::PlayerDisconnect(NSClientPlayer pl)
{ {
bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname));
@ -56,14 +56,14 @@ TFCGameRules::PlayerDisconnect(base_player pl)
} }
void void
TFCGameRules::PlayerKill(base_player pp) TFCGameRules::PlayerKill(NSClientPlayer pp)
{ {
player pl = (player)pp; player pl = (player)pp;
Damage_Apply(pl, pl, pl.health, WEAPON_NONE, DMG_SKIP_ARMOR); Damage_Apply(pl, pl, pl.health, WEAPON_NONE, DMG_SKIP_ARMOR);
} }
void void
TFCGameRules::PlayerSpawn(base_player pp) TFCGameRules::PlayerSpawn(NSClientPlayer pp)
{ {
player pl = (player)pp; player pl = (player)pp;
pl.classname = "unspawned"; pl.classname = "unspawned";

12
src/shared/player.qc
View File

@ -42,7 +42,7 @@ enumflags
PLAYER_UNUSED2 PLAYER_UNUSED2
}; };
class player:base_player class player:NSClientPlayer
{ {
/* animation */ /* animation */
PREDICTED_INT(anim_top); PREDICTED_INT(anim_top);
@ -103,7 +103,7 @@ void
player::ReceiveEntity(float new, float fl) player::ReceiveEntity(float new, float fl)
{ {
/* the generic client attributes */ /* the generic client attributes */
base_player::ReceiveEntity(new, fl); NSClientPlayer::ReceiveEntity(new, fl);
/* animation */ /* animation */
if (fl & PLAYER_TOPFRAME) { if (fl & PLAYER_TOPFRAME) {
@ -167,7 +167,7 @@ void
player::PredictPreFrame(void) player::PredictPreFrame(void)
{ {
/* the generic client attributes */ /* the generic client attributes */
base_player::PredictPreFrame(); NSClientPlayer::PredictPreFrame();
SAVE_STATE(anim_top); SAVE_STATE(anim_top);
SAVE_STATE(anim_top_delay); SAVE_STATE(anim_top_delay);
@ -200,7 +200,7 @@ void
player::PredictPostFrame(void) player::PredictPostFrame(void)
{ {
/* the generic client attributes */ /* the generic client attributes */
base_player::PredictPostFrame(); NSClientPlayer::PredictPostFrame();
ROLL_BACK(anim_top); ROLL_BACK(anim_top);
ROLL_BACK(anim_top_delay); ROLL_BACK(anim_top_delay);
@ -227,7 +227,7 @@ void
player::EvaluateEntity(void) player::EvaluateEntity(void)
{ {
/* the generic client attributes */ /* the generic client attributes */
base_player::EvaluateEntity(); NSClientPlayer::EvaluateEntity();
/* animation */ /* animation */
if (ATTR_CHANGED(anim_bottom) || ATTR_CHANGED(anim_bottom_time)) if (ATTR_CHANGED(anim_bottom) || ATTR_CHANGED(anim_bottom_time))
@ -309,7 +309,7 @@ player::SendEntity(entity ePEnt, float fChanged)
WriteFloat(MSG_ENTITY, fChanged); WriteFloat(MSG_ENTITY, fChanged);
/* the generic client attributes */ /* the generic client attributes */
base_player::SendEntity(ePEnt, fChanged); NSClientPlayer::SendEntity(ePEnt, fChanged);
if (fChanged & PLAYER_TOPFRAME) { if (fChanged & PLAYER_TOPFRAME) {
WriteByte(MSG_ENTITY, anim_top); WriteByte(MSG_ENTITY, anim_top);