server: code cleanup and minor fixes according to weapon predicting

Author: SNMetamorph

server/client.cpp

@@ -1718,16 +1718,6 @@ void UpdateClientData ( const struct edict_s *ent, int sendweapons, struct clien
 	if (sendweapons && player)
 	{
 		cd->m_flNextAttack = player->m_flNextAttack;
-		//cd->fuser2 = player->m_flNextAmmoBurn;
-		//cd->fuser3 = player->m_flAmmoStartCharge;
-		//cd->vuser1.x = player->ammo_9mm;
-		//cd->vuser1.y = player->ammo_357;
-		//cd->vuser1.z = player->ammo_argrens;
-		//cd->ammo_nails = player->ammo_bolts;
-		//cd->ammo_shells = player->ammo_buckshot;
-		//cd->ammo_rockets = player->ammo_rockets;
-		//cd->ammo_cells = player->ammo_uranium;
-		//cd->vuser2.x = player->ammo_hornets;
 
 		CBasePlayerItem *item = player->m_pActiveItem;
 		if (item)

server/player.cpp

@@ -2593,22 +2593,6 @@ void CBasePlayer::UpdatePlayerTimers()
 	m_flNextAttack -= gpGlobals->frametime;
 	if ( m_flNextAttack < -0.001 )
 		m_flNextAttack = -0.001;
-	
-	//if ( m_flNextAmmoBurn != 1000 )
-	//{
-	//	m_flNextAmmoBurn -= gpGlobals->frametime;
-	//	
-	//	if ( m_flNextAmmoBurn < -0.001 )
-	//		m_flNextAmmoBurn = -0.001;
-	//}
-
-	//if ( m_flAmmoStartCharge != 1000 )
-	//{
-	//	m_flAmmoStartCharge -= gpGlobals->frametime;
-	//	
-	//	if ( m_flAmmoStartCharge < -0.001 )
-	//		m_flAmmoStartCharge = -0.001;
-	//}
 }
 
 void CBasePlayer::UpdateWeaponTimers()
@@ -2651,12 +2635,6 @@ void CBasePlayer::UpdateWeaponTimers()
 							pGauss->m_flAmmoStartCharge = std::max(pGauss->m_flAmmoStartCharge - gpGlobals->frametime, -0.001f);
 						}
 					}
-
-					// Only decrement if not flagged as NO_DECREMENT
-					//	if ( gun->m_flPumpTime != 1000 )
-					//	{
-					//		gun->m_flPumpTime = max( gun->m_flPumpTime - gpGlobals->frametime, -0.001f );
-					//	}
 				}
 				pPlayerItem = pPlayerItem->m_pNext;
 			}

server/weapons.h

@@ -122,10 +122,6 @@ class CBasePlayerWeapon : public CBasePlayerItem
 	virtual int AddDuplicate( CBasePlayerItem *pItem ) override;
 
 	int UpdateClientData( CBasePlayer *pPlayer ) override;	// sends hud info to client dll, if things have changed
-
-	// declare it here, but in future move to the bottom
-	std::unique_ptr<CBaseWeaponContext> m_pWeaponContext;
-
 	virtual void ItemPostFrame() override;	// called each frame by the player PostThink
 
 	int	PrimaryAmmoIndex() override { return m_pWeaponContext->PrimaryAmmoIndex(); }; // forward to weapon logic
@@ -153,6 +149,8 @@ class CBasePlayerWeapon : public CBasePlayerItem
 	int	iFlags() override			{ return m_pWeaponContext->iFlags(); }
 	int iWeaponID() override		{ return m_pWeaponContext->m_iId; }
 
+	std::unique_ptr<CBaseWeaponContext> m_pWeaponContext;
+
 protected:
 	int ExtractAmmo( CBasePlayerWeapon *pWeapon );		// Return TRUE if you can add ammo to yourself when picked up
 	int ExtractClipAmmo( CBasePlayerWeapon *pWeapon );		// Return TRUE if you can add ammo to yourself when picked up