aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2017-04-25 17:33:53 +0200
committerfunjoker <funjoker109@gmail.com>2020-04-28 13:47:58 +0200
commit49f25f6e33aa4b4f67a46ba3cb71a183570da67e (patch)
tree0019cf25210d61ecafd08b9192c4a5b0d904b80d
parentcc148ebc4025af6727c57a83e154a02fc40f0366 (diff)
Core/Misc: Fix static analysis issues
(cherry picked from commit 486b03234304526d8f7d66ff0d99ea3de975745e)
-rw-r--r--src/common/Collision/Maps/TileAssembler.cpp5
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index 1ef09e55391..0a50ef21e40 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -202,13 +202,12 @@ namespace VMAP
return false;
}
printf("Read coordinate mapping...\n");
- uint32 mapID, check=0;
+ uint32 mapID, check;
std::map<uint32, MapSpawns> data;
while (!feof(dirf))
{
- check = 0;
// read mapID, Flags, NameSet, UniqueId, Pos, Rot, Scale, Bound_lo, Bound_hi, name
- check += fread(&mapID, sizeof(uint32), 1, dirf);
+ check = fread(&mapID, sizeof(uint32), 1, dirf);
if (check == 0) // EoF...
break;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index b4a8660708c..cdbfad950f2 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -12817,7 +12817,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update)
if (slot < INVENTORY_SLOT_BAG_END)
{
// item set bonuses applied only at equip and removed at unequip, and still active for broken items
- if (pProto && pProto->GetItemSet())
+ if (pProto->GetItemSet())
RemoveItemsSetItem(this, pProto);
_ApplyItemMods(pItem, slot, false);