Changed: #1135 Merge changes from Ryzom patch 1.10
This commit is contained in:
parent
85ef19776a
commit
e06a78a243
2 changed files with 6 additions and 3 deletions
|
@ -2893,8 +2893,8 @@ void CCharacter::postLoadTreatment()
|
|||
}
|
||||
|
||||
{
|
||||
H_AUTO(LockTicketInInventory);
|
||||
lockTicketInInventory();
|
||||
H_AUTO(LockTicketInInventory);
|
||||
lockTicketInInventory();
|
||||
}
|
||||
|
||||
// if EId translator has been initialized by SU, check contact list
|
||||
|
|
|
@ -3160,7 +3160,10 @@ private:
|
|||
|
||||
/// nb of auras affecting this player
|
||||
uint8 _NbAuras;
|
||||
|
||||
|
||||
/// nb of users channels
|
||||
uint8 _NbUserChannels;
|
||||
|
||||
// for a power/combat event, stores start and end ticks
|
||||
struct CFlagTickRange {
|
||||
|
||||
|
|
Loading…
Reference in a new issue