Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1135 Merge changes from Ryzom patch 1.10

Browse source
This commit is contained in:
kervala 2010-10-23 17:12:00 +02:00
parent 48dfc73ef0
commit b941df76c9
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/entities_game_service/player_manager/character.cpp
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

5
code/ryzom/server/src/entities_game_service/player_manager/character.h
View file

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