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

Fix player animations and attachment from not showing up since player drawing is handled much differently.

Browse source
This commit is contained in:
Marco Cawthorne 2022-11-08 20:29:10 -08:00
parent 33853accbe
commit ab31ae0242
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/player.qc
View file

@ -156,9 +156,7 @@ Player_PreDraw(NSClientPlayer pp, int thirdperson)
Weapons_PreDraw(pl, thirdperson); Weapons_PreDraw(pl, thirdperson);
pl.Physics_SetViewParms(); //pl.Physics_SetViewParms();
Animation_PlayerUpdate((player)pl);
Animation_TimerUpdate((player)pl, clframetime);
if (thirdperson) if (thirdperson)
Player_HandleWeaponModel(pl, thirdperson); Player_HandleWeaponModel(pl, thirdperson);

31
src/shared/player.qc
View file

@ -67,11 +67,13 @@ class player:NSClientPlayer
PREDICTED_INT(mode_tempstate); PREDICTED_INT(mode_tempstate);
virtual void(void) Physics_Jump; virtual void(void) Physics_Jump;
virtual void UpdatePlayerAnimation(void);
#ifdef CLIENT #ifdef CLIENT
////virtual void(void) draw; ////virtual void(void) draw;
//virtual float() predraw; //virtual float() predraw;
//virtual void(void) postdraw; //virtual void(void) postdraw;
virtual void UpdatePlayerAttachments(bool);
virtual void(float,float) ReceiveEntity; virtual void(float,float) ReceiveEntity;
virtual void(void) PredictPreFrame; virtual void(void) PredictPreFrame;
virtual void(void) PredictPostFrame; virtual void(void) PredictPostFrame;
@ -84,6 +86,35 @@ class player:NSClientPlayer
}; };
#ifdef CLIENT #ifdef CLIENT
void Animation_PlayerUpdate(player);
void Animation_TimerUpdate(player, float);
#endif
void
player::UpdatePlayerAnimation(void)
{
#ifdef CLIENT
/* calculate our skeletal progression */
Animation_PlayerUpdate(this);
/* advance animation timers */
Animation_TimerUpdate(this, clframetime);
#endif
}
#ifdef CLIENT
void Player_HandleWeaponModel(NSClientPlayer pp, float thirdperson);
void Player_Flashlight(NSClientPlayer);
void
player::UpdatePlayerAttachments(bool visible)
{
Player_Flashlight(this);
/* FIXME: this needs to be incorporated and simplified, now that we can handle it all in-class */
if (visible)
Player_HandleWeaponModel(this, visible ? 1:0);
}
void Weapons_AmmoUpdate(entity); void Weapons_AmmoUpdate(entity);
void HUD_AmmoNotify_Check(player pl); void HUD_AmmoNotify_Check(player pl);
void HUD_ItemNotify_Check(player pl); void HUD_ItemNotify_Check(player pl);