merge eq2emu r2870 r2869

merge ClaimWindow fix (unknown3 data)
This commit is contained in:
Image 2020-03-09 18:03:44 -04:00
parent e4b0a7c89c
commit 714d7a3676
3 changed files with 37 additions and 0 deletions

View file

@ -7231,6 +7231,7 @@ void Client::ShowClaimWindow() {
packet->setArrayDataByName("item_id", item->details.item_id, i);
i++;
}
packet->setDataByName("unknown3", 1);
QueuePacket(packet->serialize());
safe_delete(packet);
}

View file

@ -30665,6 +30665,24 @@ to zero and treated like placeholders." />
<Data ElementName="unknown" Type="int32" Size="1" />
</Data>
</Struct>
<Struct Name="WS_PromoFlagsDetails" ClientVersion="60114" OpcodeName="OP_PromoFlagsDetailsMsg">
<Data ElementName="num_claim_items" Type="int32" Size="1" />
<Data ElementName="claim_items_array" Type="Array" ArraySizeVariable="num_claim_items">
<Data ElementName="id" Type="int32" Size="1" />
<Data ElementName="not_yet_claimed" Type="int8" Size="1" />
<Data ElementName="num_remaining" Type="int32" Size="1" />
<Data ElementName="one_per_character" Type="int8" Size="1" />
<Data ElementName="claimed_on_this_char" Type="int8" Size="1" />
<Data ElementName="unknown2" Type="int8" Size="1" />
<Data ElementName="item_name" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="text" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="category" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="icon" Type="int16" Size="1" />
<Data ElementName="item_id" Type="int32" Size="1" />
<Data ElementName="unknown" Type="int32" Size="1" />
</Data>
<Data ElementName="unknown3" Type="int8" Size="1" />
</Struct>
<Struct Name="WS_CharacterAchievements" ClientVersion="603" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_CharacterAchievements">
<Data ElementName="num_achievements" Type="int16" Size="1" />
<Data ElementName="achievement_array" Type="Array" ArraySizeVariable="num_achievements">

View file

@ -30665,6 +30665,24 @@ to zero and treated like placeholders." />
<Data ElementName="unknown" Type="int32" Size="1" />
</Data>
</Struct>
<Struct Name="WS_PromoFlagsDetails" ClientVersion="60114" OpcodeName="OP_PromoFlagsDetailsMsg">
<Data ElementName="num_claim_items" Type="int32" Size="1" />
<Data ElementName="claim_items_array" Type="Array" ArraySizeVariable="num_claim_items">
<Data ElementName="id" Type="int32" Size="1" />
<Data ElementName="not_yet_claimed" Type="int8" Size="1" />
<Data ElementName="num_remaining" Type="int32" Size="1" />
<Data ElementName="one_per_character" Type="int8" Size="1" />
<Data ElementName="claimed_on_this_char" Type="int8" Size="1" />
<Data ElementName="unknown2" Type="int8" Size="1" />
<Data ElementName="item_name" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="text" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="category" Type="EQ2_16Bit_String" Size="1" />
<Data ElementName="icon" Type="int16" Size="1" />
<Data ElementName="item_id" Type="int32" Size="1" />
<Data ElementName="unknown" Type="int32" Size="1" />
</Data>
<Data ElementName="unknown3" Type="int8" Size="1" />
</Struct>
<Struct Name="WS_CharacterAchievements" ClientVersion="603" OpcodeName="OP_ClientCmdMsg" OpcodeType="OP_CharacterAchievements">
<Data ElementName="num_achievements" Type="int16" Size="1" />
<Data ElementName="achievement_array" Type="Array" ArraySizeVariable="num_achievements">