From 549a5b32bfbe8014ddb51b611662bb91ae946f47 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 19 Aug 2019 02:04:35 -0700 Subject: [PATCH] Networked ammo variables now predicted --- Source/client/predict.c | 6 ++++++ Source/shared/scihunt/player.cpp | 6 ++++-- Source/shared/valve/player.cpp | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Source/client/predict.c b/Source/client/predict.c index 88a2be6f..7c94f67a 100644 --- a/Source/client/predict.c +++ b/Source/client/predict.c @@ -26,6 +26,9 @@ void Predict_PreFrame(player pl) #ifdef VALVE pl.net_w_attack_next = pl.w_attack_next; pl.net_w_idle_next = pl.w_idle_next; + pl.net_ammo1 = pl.a_ammo1; + pl.net_ammo2 = pl.a_ammo2; + pl.net_ammo3 = pl.a_ammo3; #endif //self.netpmove_flags = self.pmove_flags; @@ -71,6 +74,9 @@ void Predict_PostFrame(player pl) #ifdef VALVE pl.w_attack_next = pl.net_w_attack_next; pl.w_idle_next = pl.net_w_idle_next; + pl.a_ammo1 = pl.net_ammo1; + pl.a_ammo2 = pl.net_ammo2; + pl.a_ammo3 = pl.net_ammo3; #endif //self.pmove_flags = self.netpmove_flags; diff --git a/Source/shared/scihunt/player.cpp b/Source/shared/scihunt/player.cpp index 18e49fbd..4c92dfe2 100644 --- a/Source/shared/scihunt/player.cpp +++ b/Source/shared/scihunt/player.cpp @@ -51,8 +51,10 @@ class player float net_w_idle_next; float netjumptime; float netteleport_time; - - virtual void() set_model; + int net_ammo1; + int net_ammo2; + int net_ammo3; + virtual void(string) set_model; virtual void() gun_offset; virtual void() draw; virtual float() predraw; diff --git a/Source/shared/valve/player.cpp b/Source/shared/valve/player.cpp index 8bc4ae59..7c8c97d9 100644 --- a/Source/shared/valve/player.cpp +++ b/Source/shared/valve/player.cpp @@ -1,4 +1,3 @@ - class player { float health; @@ -50,8 +49,11 @@ class player float net_w_idle_next; float netjumptime; float netteleport_time; + int net_ammo1; + int net_ammo2; + int net_ammo3; - virtual void() set_model; + virtual void(string) set_model; virtual void() gun_offset; virtual void() draw; virtual float() predraw; @@ -71,3 +73,4 @@ class player int ammo_hornet; #endif }; +