Merge with hotfix
--HG-- branch : develop
This commit is contained in:
commit
0a7462f7e1
2 changed files with 3 additions and 3 deletions
|
@ -138,7 +138,7 @@ void initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
|
|||
#define TYPE_BOT_TRADE_SELECTOR2 uint64
|
||||
|
||||
#define TYPE_EVENT_FACTION_ID uint32
|
||||
#define TYPE_PVP_MODE uint32
|
||||
#define TYPE_PVP_MODE uint16
|
||||
#define TYPE_PVP_CLAN uint32
|
||||
|
||||
#define TYPE_FUEL bool
|
||||
|
|
|
@ -292,14 +292,14 @@
|
|||
</STRUCT>
|
||||
<STRUCT>
|
||||
<ATOM Name="name" Value="PvpMode"/>
|
||||
<ATOM Name="type" Value="uint8"/>
|
||||
<ATOM Name="type" Value="uint16"/>
|
||||
<ATOM Name="persistant" Value="true"/>
|
||||
<ATOM Name="mirror" Value="true"/>
|
||||
<ATOM Name="weight" Value="1"/>
|
||||
</STRUCT>
|
||||
<STRUCT>
|
||||
<ATOM Name="name" Value="PvpClan"/>
|
||||
<ATOM Name="type" Value="uint8"/>
|
||||
<ATOM Name="type" Value="uint32"/>
|
||||
<ATOM Name="persistant" Value="true"/>
|
||||
<ATOM Name="mirror" Value="true"/>
|
||||
<ATOM Name="weight" Value="1"/>
|
||||
|
|
Loading…
Reference in a new issue