Skip to content

Commit cc98f40

Browse files
authored
[Fix] - Set item tier bytes from "0" to "1" (#219)
Modified item tier byte to be 1 by default. Added one "static_cast<uint8_t>" in the function "item->getImbuementSlot()", for resolve review check from CodeQL.
1 parent 29846fa commit cc98f40

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/server/network/protocol/protocolgame.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, uint16_t id, uint8_t count)
7676
msg.addByte(0x01);
7777
}
7878
if (it.upgradeClassification > 0) {
79-
msg.addByte(0);
79+
msg.addByte(1);
8080
}
8181
}
8282

@@ -191,7 +191,7 @@ void ProtocolGame::AddItem(NetworkMessage &msg, const Item *item)
191191
msg.addByte(podiumVisible ? static_cast<uint8_t>(boost::get<int64_t>(podiumVisible->value)) : 0x01);
192192
}
193193
if (it.upgradeClassification > 0) {
194-
msg.addByte(0);
194+
msg.addByte(1);
195195
}
196196
}
197197

@@ -4046,7 +4046,7 @@ void ProtocolGame::sendMarketEnter(uint32_t depotId)
40464046
msg.add<uint16_t>(it->first);
40474047
if (Item::items[it->first].upgradeClassification > 0)
40484048
{
4049-
msg.addByte(0);
4049+
msg.addByte(1);
40504050
}
40514051
msg.add<uint16_t>(std::min<uint32_t>(0xFFFF, it->second));
40524052
}
@@ -4121,7 +4121,7 @@ void ProtocolGame::sendMarketBrowseItem(uint16_t itemId, const MarketOfferList &
41214121
msg.addByte(MARKETREQUEST_ITEM_BROWSE);
41224122
msg.addItemId(itemId);
41234123
if (Item::items[itemId].upgradeClassification > 0) {
4124-
msg.addByte(0);
4124+
msg.addByte(1);
41254125
}
41264126

41274127
msg.add<uint32_t>(buyOffers.size());
@@ -4155,7 +4155,7 @@ void ProtocolGame::sendMarketAcceptOffer(const MarketOfferEx &offer)
41554155
msg.addByte(MARKETREQUEST_ITEM_BROWSE);
41564156
msg.addItemId(offer.itemId);
41574157
if (Item::items[offer.itemId].upgradeClassification > 0) {
4158-
msg.addByte(0);
4158+
msg.addByte(1);
41594159
}
41604160

41614161
if (offer.type == MARKETACTION_BUY)
@@ -4195,7 +4195,7 @@ void ProtocolGame::sendMarketBrowseOwnOffers(const MarketOfferList &buyOffers, c
41954195
msg.add<uint16_t>(offer.counter);
41964196
msg.addItemId(offer.itemId);
41974197
if (Item::items[offer.itemId].upgradeClassification > 0) {
4198-
msg.addByte(0);
4198+
msg.addByte(1);
41994199
}
42004200
msg.add<uint16_t>(offer.amount);
42014201
msg.add<uint64_t>(offer.price);
@@ -4208,7 +4208,7 @@ void ProtocolGame::sendMarketBrowseOwnOffers(const MarketOfferList &buyOffers, c
42084208
msg.add<uint16_t>(offer.counter);
42094209
msg.addItemId(offer.itemId);
42104210
if (Item::items[offer.itemId].upgradeClassification > 0) {
4211-
msg.addByte(0);
4211+
msg.addByte(1);
42124212
}
42134213
msg.add<uint16_t>(offer.amount);
42144214
msg.add<uint64_t>(offer.price);
@@ -4230,7 +4230,7 @@ void ProtocolGame::sendMarketCancelOffer(const MarketOfferEx &offer)
42304230
msg.add<uint16_t>(offer.counter);
42314231
msg.addItemId(offer.itemId);
42324232
if (Item::items[offer.itemId].upgradeClassification > 0) {
4233-
msg.addByte(0);
4233+
msg.addByte(1);
42344234
}
42354235
msg.add<uint16_t>(offer.amount);
42364236
msg.add<uint64_t>(offer.price);
@@ -4244,7 +4244,7 @@ void ProtocolGame::sendMarketCancelOffer(const MarketOfferEx &offer)
42444244
msg.add<uint16_t>(offer.counter);
42454245
msg.addItemId(offer.itemId);
42464246
if (Item::items[offer.itemId].upgradeClassification > 0) {
4247-
msg.addByte(0);
4247+
msg.addByte(1);
42484248
}
42494249
msg.add<uint16_t>(offer.amount);
42504250
msg.add<uint64_t>(offer.price);
@@ -4271,7 +4271,7 @@ void ProtocolGame::sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyO
42714271
msg.add<uint16_t>(counterMap[it->timestamp]++);
42724272
msg.addItemId(it->itemId);
42734273
if (Item::items[it->itemId].upgradeClassification > 0) {
4274-
msg.addByte(0);
4274+
msg.addByte(1);
42754275
}
42764276
msg.add<uint16_t>(it->amount);
42774277
msg.add<uint64_t>(it->price);
@@ -4288,7 +4288,7 @@ void ProtocolGame::sendMarketBrowseOwnHistory(const HistoryMarketOfferList &buyO
42884288
msg.add<uint16_t>(counterMap[it->timestamp]++);
42894289
msg.addItemId(it->itemId);
42904290
if (Item::items[it->itemId].upgradeClassification > 0) {
4291-
msg.addByte(0);
4291+
msg.addByte(1);
42924292
}
42934293
msg.add<uint16_t>(it->amount);
42944294
msg.add<uint64_t>(it->price);
@@ -4332,7 +4332,7 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId)
43324332
const ItemType &it = Item::items[itemId];
43334333

43344334
if (it.upgradeClassification > 0) {
4335-
msg.addByte(0);
4335+
msg.addByte(1);
43364336
}
43374337

43384338
if (it.armor != 0)
@@ -6494,12 +6494,12 @@ void ProtocolGame::openImbuementWindow(Item *item)
64946494
msg.addByte(0xEB);
64956495
msg.addItemId(item->getID());
64966496
if (Item::items[item->getID()].upgradeClassification > 0) {
6497-
msg.addByte(0);
6497+
msg.addByte(1);
64986498
}
64996499
msg.addByte(item->getImbuementSlot());
65006500

65016501
// Send imbuement time
6502-
for (uint8_t slotid = 0; slotid < item->getImbuementSlot(); slotid++)
6502+
for (uint8_t slotid = 0; slotid < static_cast<uint8_t>(item->getImbuementSlot()); slotid++)
65036503
{
65046504
ImbuementInfo imbuementInfo;
65056505
if (!item->getImbuementInfo(slotid, &imbuementInfo))
@@ -6853,7 +6853,7 @@ void ProtocolGame::sendItemsPrice()
68536853
msg.addItemId(it.first);
68546854
if (Item::items[it.first].upgradeClassification > 0)
68556855
{
6856-
msg.addByte(0);
6856+
msg.addByte(1);
68576857
}
68586858
msg.add<uint32_t>(it.second);
68596859
msg.add<uint32_t>(0);

0 commit comments

Comments
 (0)