Changed: #1135 Merge changes from Ryzom patch 1.10

hg/feature/sound
kervala 14 years ago
parent d68ee5fbe5
commit 41d2767a33

@ -2893,8 +2893,8 @@ void CCharacter::postLoadTreatment()
} }
{ {
H_AUTO(LockTicketInInventory); H_AUTO(LockTicketInInventory);
lockTicketInInventory(); lockTicketInInventory();
} }
// if EId translator has been initialized by SU, check contact list // if EId translator has been initialized by SU, check contact list

@ -3160,7 +3160,10 @@ private:
/// nb of auras affecting this player /// nb of auras affecting this player
uint8 _NbAuras; uint8 _NbAuras;
/// nb of users channels
uint8 _NbUserChannels;
// for a power/combat event, stores start and end ticks // for a power/combat event, stores start and end ticks
struct CFlagTickRange { struct CFlagTickRange {

Loading…
Cancel
Save