diff --git a/changelog.txt b/changelog.txt index a7a1127dd..af5018313 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 02/11/2015 == +Trevius: (RoF+) Bandolier no longer displays a Treasure Chest Icon when no Bandoliers are set. + == 02/09/2015 == Trevius: (RoF+) Setting Alt flag on characters in the Guild Management Window is now saved and functional for filtering. Trevius: (RoF+) Guild Invites between RoF+ and previous Clients is now functional. diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 0906e9915..d632fdebd 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -2296,7 +2296,15 @@ namespace RoF { outapp->WriteString(emu->bandoliers[r].items[j].item_name); outapp->WriteUInt32(emu->bandoliers[r].items[j].item_id); - outapp->WriteUInt32(emu->bandoliers[r].items[j].icon); + if (emu->bandoliers[r].items[j].icon) + { + outapp->WriteSInt32(emu->bandoliers[r].items[j].icon); + } + else + { + // If no icon, it must send -1 or Treasure Chest Icon (836) is displayed + outapp->WriteSInt32(-1); + } } } @@ -2308,7 +2316,7 @@ namespace RoF { outapp->WriteString(""); outapp->WriteUInt32(0); - outapp->WriteUInt32(0); + outapp->WriteSInt32(-1); } } @@ -2318,14 +2326,21 @@ namespace RoF { outapp->WriteString(emu->potionbelt.items[r].item_name); outapp->WriteUInt32(emu->potionbelt.items[r].item_id); - outapp->WriteUInt32(emu->potionbelt.items[r].icon); + if (emu->potionbelt.items[r].icon) + { + outapp->WriteSInt32(emu->potionbelt.items[r].icon); + } + else + { + outapp->WriteSInt32(-1); + } } for (uint32 r = 0; r < structs::MAX_POTIONS_IN_BELT - EmuConstants::POTION_BELT_SIZE; r++) { outapp->WriteString(""); outapp->WriteUInt32(0); - outapp->WriteUInt32(0); + outapp->WriteSInt32(-1); } outapp->WriteSInt32(-1); // Unknown; diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index ab00d8889..25c63c52b 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -2370,7 +2370,15 @@ namespace RoF2 { outapp->WriteString(emu->bandoliers[r].items[j].item_name); outapp->WriteUInt32(emu->bandoliers[r].items[j].item_id); - outapp->WriteUInt32(emu->bandoliers[r].items[j].icon); + if (emu->bandoliers[r].items[j].icon) + { + outapp->WriteSInt32(emu->bandoliers[r].items[j].icon); + } + else + { + // If no icon, it must send -1 or Treasure Chest Icon (836) is displayed + outapp->WriteSInt32(-1); + } } } @@ -2382,7 +2390,7 @@ namespace RoF2 { outapp->WriteString(""); outapp->WriteUInt32(0); - outapp->WriteUInt32(0); + outapp->WriteSInt32(-1); } } @@ -2392,14 +2400,21 @@ namespace RoF2 { outapp->WriteString(emu->potionbelt.items[r].item_name); outapp->WriteUInt32(emu->potionbelt.items[r].item_id); - outapp->WriteUInt32(emu->potionbelt.items[r].icon); + if (emu->potionbelt.items[r].icon) + { + outapp->WriteSInt32(emu->potionbelt.items[r].icon); + } + else + { + outapp->WriteSInt32(-1); + } } for (uint32 r = 0; r < structs::MAX_POTIONS_IN_BELT - EmuConstants::POTION_BELT_SIZE; r++) { outapp->WriteString(""); outapp->WriteUInt32(0); - outapp->WriteUInt32(0); + outapp->WriteSInt32(-1); } outapp->WriteSInt32(-1); // Unknown;