Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ricardocampos23
2014-04-10 14:10:19 +01:00
90 changed files with 3801 additions and 1063 deletions
+2 -1
View File
@@ -5084,8 +5084,9 @@ char* SerializeItem(const ItemInst *inst, int16 slot_id_in, uint32 *length, uint
memset(&isbs, 0, sizeof(RoF::structs::ItemSecondaryBodyStruct));
isbs.augtype = item->AugType;
isbs.augrestrict = item->AugRestrict;
isbs.augdistiller = 0;
isbs.augrestrict = item->AugRestrict;
for(int x = 0; x < 5; ++x)
{
+4 -1
View File
@@ -4427,8 +4427,11 @@ struct AugSlotStruct
struct ItemSecondaryBodyStruct
{
uint32 augtype;
uint32 augrestrict;
// swapped augrestrict and augdistiller positions
// (this swap does show the proper augment restrictions in Item Information window now)
// unsure what the purpose of augdistiller is at this time -U 3/17/2014
uint32 augdistiller; // New to December 10th 2012 client - NEW
uint32 augrestrict;
AugSlotStruct augslots[6];
uint32 ldonpoint_type;