Changed: #1135 Merge changes from Ryzom patch 1.10

This commit is contained in:
kervala 2010-10-23 17:12:00 +02:00
parent 85ef19776a
commit e06a78a243
2 changed files with 6 additions and 3 deletions

View file

@ -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

View file

@ -3161,6 +3161,9 @@ 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 {