From e669d7c5156f7592bfa3d8bf217840003f206463 Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 20 Oct 2010 16:16:32 +0200 Subject: [PATCH] Changed: #1135 Merge changes from Ryzom patch 1.10 --- .../entities_game_service/player_manager/character.cpp | 8 ++++---- .../entities_game_service/player_manager/character.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp index 6b3bd6ea5..24cbf2173 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp @@ -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++; diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h index e1c190513..76bf8c64d 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character.h +++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h @@ -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;