fn/rewolf
fn/rewolf
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust naming against upstream.

Browse source
This commit is contained in:
Marco Cawthorne 2022-05-11 12:51:21 -07:00
parent 42a5bc99be
commit 413f913516
Signed by: eukara
GPG key ID: C196CD8BA993248A
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/server/gamerules.qc
View file

@ -24,7 +24,7 @@ HLGameRules::IsMultiplayer(void)
} }
void void
HLGameRules::LevelDecodeParms(base_player pp) HLGameRules::LevelDecodeParms(NSClientPlayer pp)
{ {
player pl = (player)pp; player pl = (player)pp;
g_landmarkpos[0] = parm1; g_landmarkpos[0] = parm1;
@ -69,7 +69,7 @@ HLGameRules::LevelDecodeParms(base_player pp)
} }
void void
HLGameRules::LevelChangeParms(base_player pp) HLGameRules::LevelChangeParms(NSClientPlayer pp)
{ {
player pl = (player)pp; player pl = (player)pp;
parm1 = g_landmarkpos[0]; parm1 = g_landmarkpos[0];
@ -119,19 +119,19 @@ HLGameRules::LevelNewParms(void)
/* 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
HLGameRules::PlayerPostFrame(base_player pp) HLGameRules::PlayerPostFrame(NSClientPlayer pp)
{ {
} }
void void
HLGameRules::PlayerConnect(base_player pl) HLGameRules::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
HLGameRules::PlayerDisconnect(base_player pl) HLGameRules::PlayerDisconnect(NSClientPlayer pl)
{ {
bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname)); bprint(PRINT_HIGH, sprintf("%s disconnected\n", pl.netname));
@ -145,7 +145,7 @@ HLGameRules::PlayerDisconnect(base_player pl)
} }
void void
HLGameRules::PlayerKill(base_player pp) HLGameRules::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);

6
src/server/gamerules_multiplayer.qc
View file

@ -41,7 +41,7 @@ HLMultiplayerRules::CheckRules(void)
} }
void void
HLMultiplayerRules::PlayerDeath(base_player pl) HLMultiplayerRules::PlayerDeath(NSClientPlayer pl)
{ {
/* obituary networking */ /* obituary networking */
WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET); WriteByte(MSG_MULTICAST, SVC_CGAMEPACKET);
@ -103,7 +103,7 @@ HLMultiplayerRules::PlayerDeath(base_player pl)
} }
void void
HLMultiplayerRules::PlayerSpawn(base_player pp) HLMultiplayerRules::PlayerSpawn(NSClientPlayer pp)
{ {
player pl = (player)pp; player pl = (player)pp;
/* this is where the mods want to deviate */ /* this is where the mods want to deviate */
@ -154,7 +154,7 @@ HLMultiplayerRules::PlayerSpawn(base_player pp)
} }
float float
HLMultiplayerRules::ConsoleCommand(base_player pp, string cmd) HLMultiplayerRules::ConsoleCommand(NSClientPlayer pp, string cmd)
{ {
tokenize(cmd); tokenize(cmd);

12
src/shared/player.qc
View file

@ -42,7 +42,7 @@ enumflags
PLAYER_UNUSED2 PLAYER_UNUSED2
}; };
class player:base_player class player:NSClientPlayer
{ {
PREDICTED_INT(anim_top); PREDICTED_INT(anim_top);
PREDICTED_FLOAT(anim_top_time); PREDICTED_FLOAT(anim_top_time);
@ -102,7 +102,7 @@ player::ReceiveEntity
void void
player::ReceiveEntity(float new, float fl) player::ReceiveEntity(float new, float fl)
{ {
base_player::ReceiveEntity(new, fl); NSClientPlayer::ReceiveEntity(new, fl);
/* animation */ /* animation */
if (fl & PLAYER_TOPFRAME) { if (fl & PLAYER_TOPFRAME) {
@ -166,7 +166,7 @@ so we can roll them back later.
void void
player::PredictPreFrame(void) player::PredictPreFrame(void)
{ {
base_player::PredictPreFrame(); NSClientPlayer::PredictPreFrame();
SAVE_STATE(anim_top); SAVE_STATE(anim_top);
SAVE_STATE(anim_top_time); SAVE_STATE(anim_top_time);
@ -214,7 +214,7 @@ Where we roll back our values to the ones last sent/verified by the server.
void void
player::PredictPostFrame(void) player::PredictPostFrame(void)
{ {
base_player::PredictPostFrame(); NSClientPlayer::PredictPostFrame();
ROLL_BACK(anim_top); ROLL_BACK(anim_top);
ROLL_BACK(anim_top_time); ROLL_BACK(anim_top_time);
@ -256,7 +256,7 @@ player::PredictPostFrame(void)
void void
player::EvaluateEntity(void) player::EvaluateEntity(void)
{ {
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))
@ -381,7 +381,7 @@ player::SendEntity(entity ePEnt, float fChanged)
WriteByte(MSG_ENTITY, ENT_PLAYER); WriteByte(MSG_ENTITY, ENT_PLAYER);
WriteFloat(MSG_ENTITY, fChanged); WriteFloat(MSG_ENTITY, fChanged);
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);