From 1664c1bd2ed38816488a81bfc40a9f501c0724b6 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Tue, 25 Apr 2017 17:33:53 +0200 Subject: [PATCH] Core/Misc: Fix static analysis issues --- src/common/Collision/Maps/TileAssembler.cpp | 9 ++++----- src/server/game/Entities/Player/Player.cpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index cbd468d333..2c4d310505 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -216,18 +216,17 @@ namespace VMAP return false; } printf("Read coordinate mapping...\n"); - uint32 mapID, tileX, tileY, check=0; + uint32 mapID, tileX, tileY, check; G3D::Vector3 v1, v2; ModelSpawn spawn; while (!feof(dirf)) { - check = 0; // read mapID, tileX, tileY, Flags, adtID, ID, 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; - check += fread(&tileX, sizeof(uint32), 1, dirf); - check += fread(&tileY, sizeof(uint32), 1, dirf); + fread(&tileX, sizeof(uint32), 1, dirf); + fread(&tileY, sizeof(uint32), 1, dirf); if (!ModelSpawn::readFromFile(dirf, spawn)) break; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 848cf97041..470a6a62d5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -12218,7 +12218,7 @@ void Player::DestroyItem(uint8 bag, uint8 slot, bool update) ItemTemplate const* pProto = pItem->GetTemplate(); // item set bonuses applied only at equip and removed at unequip, and still active for broken items - if (pProto && pProto->ItemSet) + if (pProto->ItemSet) RemoveItemsSetItem(this, pProto); _ApplyItemMods(pItem, slot, false);