Changed: Merge changes from Ryzom patch 1.10

This commit is contained in:
kervala 2010-10-20 16:16:32 +02:00
parent c6acfb86f3
commit 934883d4d0
2 changed files with 9 additions and 9 deletions
code/ryzom/server/src/entities_game_service/player_manager

View file

@ -17662,10 +17662,10 @@ void CCharacter::barUpdate()
_PhysScores._PhysicalScores[ SCORES::focus].Current() != _OldFocusBarSentToPlayer )
{
// bkup cache
_OldHpBarSentToPlayer= (sint16)_PhysScores._PhysicalScores[ SCORES::hit_points ].Current();
_OldSapBarSentToPlayer= (sint16)_PhysScores._PhysicalScores[ SCORES::sap].Current();
_OldStaBarSentToPlayer= (sint16)_PhysScores._PhysicalScores[ SCORES::stamina].Current();
_OldFocusBarSentToPlayer= (sint16)_PhysScores._PhysicalScores[ SCORES::focus].Current();
_OldHpBarSentToPlayer= _PhysScores._PhysicalScores[ SCORES::hit_points ].Current();
_OldSapBarSentToPlayer= _PhysScores._PhysicalScores[ SCORES::sap].Current();
_OldStaBarSentToPlayer= _PhysScores._PhysicalScores[ SCORES::stamina].Current();
_OldFocusBarSentToPlayer= _PhysScores._PhysicalScores[ SCORES::focus].Current();
// Since client must listen only the last message (no delta like DB here...), use a small counter
_BarSentToPlayerMsgNumber++;

View file

@ -2914,11 +2914,11 @@ private:
/// temp values used to test if Players bars need an update or not
uint8 _BarSentToPlayerMsgNumber;
/// NB: 16 bits because guigui ensure me cannot goes beyond something like 6000
sint16 _OldHpBarSentToPlayer;
sint16 _OldSapBarSentToPlayer;
sint16 _OldStaBarSentToPlayer;
sint16 _OldFocusBarSentToPlayer;
sint32 _OldHpBarSentToPlayer;
sint32 _OldSapBarSentToPlayer;
sint32 _OldStaBarSentToPlayer;
sint32 _OldFocusBarSentToPlayer;
NLMISC::TGameCycle _LastTickSaved;
NLMISC::TGameCycle _LastTickCompassUpdated;