diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/game/FleeingMovementGenerator.h | 2 | ||||
-rw-r--r-- | src/game/Level3.cpp | 10 | ||||
-rw-r--r-- | src/game/Map.cpp | 9 | ||||
-rw-r--r-- | src/game/Object.cpp | 10 | ||||
-rw-r--r-- | src/game/ObjectMgr.cpp | 8 | ||||
-rw-r--r-- | src/game/PetAI.h | 1 | ||||
-rw-r--r-- | src/game/Player.cpp | 9 | ||||
-rw-r--r-- | src/game/PointMovementGenerator.h | 4 | ||||
-rw-r--r-- | src/game/PoolHandler.cpp | 2 | ||||
-rw-r--r-- | src/game/SkillDiscovery.cpp | 2 | ||||
-rw-r--r-- | src/game/SocialMgr.cpp | 4 | ||||
-rw-r--r-- | src/game/Spell.cpp | 6 | ||||
-rw-r--r-- | src/game/SpellEffects.cpp | 6 | ||||
-rw-r--r-- | src/game/SpellMgr.cpp | 8 | ||||
-rw-r--r-- | src/game/ThreatManager.cpp | 5 | ||||
-rw-r--r-- | src/game/Unit.cpp | 9 | ||||
-rw-r--r-- | src/game/Unit.h | 2 | ||||
-rw-r--r-- | src/game/UpdateData.cpp | 2 |
18 files changed, 62 insertions, 37 deletions
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h index a6957545d41..0b580ab1504 100644 --- a/src/game/FleeingMovementGenerator.h +++ b/src/game/FleeingMovementGenerator.h @@ -56,8 +56,8 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator float i_last_distance_from_caster; float i_to_distance_from_caster; float i_cur_angle; - TimeTracker i_nextCheckTime; uint64 i_frightGUID; + TimeTracker i_nextCheckTime; DestinationHolder< Traveller<T> > i_destinationHolder; }; diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 259bba869e2..ba408101c7d 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -1186,7 +1186,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg) return true; } -bool ChatHandler::HandleReloadDbScriptStringCommand(const char* arg) +bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/) { sLog.outString( "Re-Loading Script strings from `db_script_string`..."); objmgr.LoadDbScriptStrings(); @@ -2546,7 +2546,7 @@ bool ChatHandler::HandleAddItemCommand(const char* args) if(args[0]=='[') // [name] manual form { - char* citemName = citemName = strtok((char*)args, "]"); + char* citemName = strtok((char*)args, "]"); if(citemName && citemName[0]) { @@ -4021,7 +4021,7 @@ bool ChatHandler::HandleDamageCommand(const char * args) if(!spellid || !sSpellStore.LookupEntry(spellid)) return false; - m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage, false); + m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage); return true; } @@ -5536,7 +5536,7 @@ bool ChatHandler::HandleResetAllCommand(const char * args) return true; } -bool ChatHandler::HandleServerShutDownCancelCommand(const char* args) +bool ChatHandler::HandleServerShutDownCancelCommand(const char* /*args*/) { sWorld.ShutdownCancel(); return true; @@ -5553,7 +5553,7 @@ bool ChatHandler::HandleServerShutDownCommand(const char* args) int32 time = atoi (time_str); ///- Prevent interpret wrong arg value as 0 secs shutdown time - if(time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0) + if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0) return false; if (exitcode_str) diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 7f9a24bc484..ffe5dccfe6b 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -185,9 +185,10 @@ void Map::DeleteStateMachine() } Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode) - : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), - i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), i_gridExpiry(expiry), - m_activeNonPlayersIter(m_activeNonPlayers.end()) + : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), + i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), + m_activeNonPlayersIter(m_activeNonPlayers.end()), + i_gridExpiry(expiry) , i_lock(true) { for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx) @@ -1340,7 +1341,7 @@ uint16 GridMap::getArea(float x, float y) return m_area_map[lx*16 + ly]; } -float GridMap::getHeightFromFlat(float x, float y) const +float GridMap::getHeightFromFlat(float /*x*/, float /*y*/) const { return m_gridHeight; } diff --git a/src/game/Object.cpp b/src/game/Object.cpp index a0e9ab4a98a..56d52f5e49f 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -176,6 +176,8 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c case GAMEOBJECT_TYPE_TRANSPORT: flags |= UPDATEFLAG_TRANSPORT; break; + default: + break; } } @@ -534,10 +536,10 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *data << uint32(m_floatValues[ index ] < 0 ? 0 : m_floatValues[ index ]); } // there are some float values which may be negative or can't get negative due to other checks - else if(index >= UNIT_FIELD_NEGSTAT0 && index <= UNIT_FIELD_NEGSTAT4 || - index >= UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + 6) || - index >= UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + 6) || - index >= UNIT_FIELD_POSSTAT0 && index <= UNIT_FIELD_POSSTAT4) + else if ((index >= UNIT_FIELD_NEGSTAT0 && index <= UNIT_FIELD_NEGSTAT4) || + (index >= UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + 6)) || + (index >= UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + 6)) || + (index >= UNIT_FIELD_POSSTAT0 && index <= UNIT_FIELD_POSSTAT4)) { *data << uint32(m_floatValues[ index ]); } diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 18242265fcb..4ed4c282e33 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -5048,8 +5048,10 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float if(MapId != entry->map_id) { // if find graveyard at different map from where entrance placed (or no entrance data), use any first - if (!mapEntry || mapEntry->entrance_map < 0 || mapEntry->entrance_map != entry->map_id || - mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0) + if (!mapEntry || + mapEntry->entrance_map < 0 || + mapEntry->entrance_map != entry->map_id || + (mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0)) { // not have any corrdinates for check distance anyway entryFar = entry; @@ -7170,6 +7172,8 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val case CONDITION_INSTANCE_DATA: //TODO: need some check break; + case CONDITION_NONE: + break; } return true; } diff --git a/src/game/PetAI.h b/src/game/PetAI.h index a346908ee0e..67ce6edefe3 100644 --- a/src/game/PetAI.h +++ b/src/game/PetAI.h @@ -47,6 +47,7 @@ class TRINITY_DLL_DECL PetAI : public CreatureAI void UpdateAllies(); TimeTracker i_tracker; + bool inCombat; std::set<uint64> m_AllySet; uint32 m_updateAlliesTimer; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 966c23623be..f21b473453a 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1936,6 +1936,7 @@ void Player::Regenerate(Powers power) } break; case POWER_FOCUS: case POWER_HAPPINESS: + case POWER_HEALTH: break; } @@ -4897,6 +4898,8 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply) UpdateExpertise(OFF_ATTACK); } break; + case CR_ARMOR_PENETRATION: + break; } } @@ -5696,7 +5699,7 @@ uint32 Player::TeamForRace(uint8 race) case 1: return HORDE; } - sLog.outError("Race %u have wrong team id in DBC: wrong DBC files?",uint32(race),rEntry->TeamID); + sLog.outError("Race %u have wrong teamid %u in DBC: wrong DBC files?",uint32(race),rEntry->TeamID); return ALLIANCE; } @@ -9950,7 +9953,6 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p if (!pItem->IsBag()) return EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT; - Bag *pBag = (Bag*)pItem; if( !HasBankBagSlot( slot ) ) return EQUIP_ERR_MUST_PURCHASE_THAT_BAG_SLOT; @@ -13305,7 +13307,6 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques uint32 reqitemcount = pQuest->ReqItemCount[i]; if( reqitemcount != 0 ) { - uint32 quest_id = pQuest->GetQuestId(); uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i],true); questStatusData.m_itemcount[i] = std::min(curitemcount, reqitemcount); @@ -19102,7 +19103,7 @@ uint32 Player::GetResurrectionSpellId() case 27239: spell_id = 27240; break; // rank 6 case 47883: spell_id = 47882; break; // rank 7 default: - sLog.outError("Unhandled spell %%u: S.Resurrection",(*itr)->GetId()); + sLog.outError("Unhandled spell %u: S.Resurrection",(*itr)->GetId()); continue; } diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h index 6dfb1d6f8ec..7551e3827b4 100644 --- a/src/game/PointMovementGenerator.h +++ b/src/game/PointMovementGenerator.h @@ -45,9 +45,9 @@ class TRINITY_DLL_SPEC PointMovementGenerator bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; } private: - TimeTracker i_nextMoveTime; - float i_x,i_y,i_z; uint32 id; + float i_x,i_y,i_z; + TimeTracker i_nextMoveTime; DestinationHolder< Traveller<T> > i_destinationHolder; bool arrived; }; diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp index bb2276a6d24..54b18fc6b28 100644 --- a/src/game/PoolHandler.cpp +++ b/src/game/PoolHandler.cpp @@ -322,7 +322,7 @@ bool PoolGroup<GameObject>::ReSpawn1Object(uint32 guid) // Nothing to do for a child Pool template <> -bool PoolGroup<Pool>::ReSpawn1Object(uint32 guid) +bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/) { return true; } diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp index 7bd7b2347b1..0c0517eb320 100644 --- a/src/game/SkillDiscovery.cpp +++ b/src/game/SkillDiscovery.cpp @@ -93,7 +93,7 @@ void LoadSkillDiscoveryTable() // explicit discovery ability !IsExplicitDiscoverySpell(spellEntry)) { - sLog.outErrorDb("Spell (ID: %u) not have have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc and not 100% chance random discovery ability but listed in `skill_discovery_template` table",spellId); + sLog.outErrorDb("Spell (ID: %u) not have have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc and not 100%% chance random discovery ability but listed in `skill_discovery_template` table",spellId); continue; } diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 1fc3f83ab1b..fb0e1574d08 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -242,6 +242,8 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr case FRIEND_ADDED_ONLINE: data << fi.Note; break; + default: + break; } switch(result) @@ -253,6 +255,8 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr data << uint32(fi.Level); data << uint32(fi.Class); break; + default: + break; } if(broadcast) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9365c66a3e4..91d4fd0bc07 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -2933,6 +2933,8 @@ void Spell::SendCastResult(SpellCastResult result) data << uint32(m_spellInfo->EquippedItemSubClassMask); //data << uint32(m_spellInfo->EquippedItemInventoryTypeMask); break; + default: + break; } ((Player*)m_caster)->GetSession()->SendPacket(&data); } @@ -2955,8 +2957,6 @@ void Spell::SendSpellStart() if(m_spellInfo->runeCostID) castFlags |= CAST_FLAG_UNKNOWN10; - Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster; - WorldPacket data(SMSG_SPELL_START, (8+8+4+4+2)); if(m_CastItem) data.append(m_CastItem->GetPackGUID()); @@ -2988,8 +2988,6 @@ void Spell::SendSpellGo() sLog.outDebug("Sending SMSG_SPELL_GO id=%u", m_spellInfo->Id); - Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster; - uint32 castFlags = CAST_FLAG_UNKNOWN3; if(IsRangedSpell()) castFlags |= CAST_FLAG_AMMO; // arrows/bullets visual diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index dd3b844a36f..cd2d57e7c65 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2617,7 +2617,7 @@ void Spell::EffectHealthLeech(uint32 i) int32 new_damage = int32(damage*multiplier); uint32 curHealth = unitTarget->GetHealth(); - new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage, m_IsTriggeredSpell, true); + new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage ); if(curHealth < new_damage) new_damage = curHealth; @@ -2971,6 +2971,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype) gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster); // Don't return, let loots been taken + default: + break; } } @@ -3754,7 +3756,7 @@ void Spell::EffectEnchantItemPrismatic(uint32 effect_idx) } if(!add_socket) { - sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (u), not suppoted yet.", + sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (%u), not suppoted yet.", m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET); return; } diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 46b534905ca..639f4e552e4 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -813,6 +813,8 @@ bool IsSingleTargetSpell(SpellEntry const *spellInfo) { case SPELL_JUDGEMENT: return true; + default: + break; } // single target triggered spell. @@ -842,6 +844,8 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI if(GetSpellSpecific(spellInfo2->Id) == spec1) return true; break; + default: + break; } return false; @@ -3144,6 +3148,8 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group) case DIMINISHING_BANISH: case DIMINISHING_LIMITONLY: return true; + default: + return false; } return false; } @@ -3171,6 +3177,8 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group) case DIMINISHING_WARLOCK_FEAR: case DIMINISHING_KNOCKOUT: return DRTYPE_PLAYER; + default: + break; } return DRTYPE_NONE; diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp index ab989ad9598..55fcf51c5b0 100644 --- a/src/game/ThreatManager.cpp +++ b/src/game/ThreatManager.cpp @@ -320,8 +320,9 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe break; } - if( currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() || - currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() && pAttacker->IsWithinMeleeRange(target) ) + if ((currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() || + currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat()) && + pAttacker->IsWithinMeleeRange(target)) { //implement 110% threat rule for targets in melee range found = true; //and 130% rule for targets in ranged distances break; //for selecting alive targets diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index b7a731aaa12..b8d1be768d7 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1196,7 +1196,7 @@ void Unit::CastSpell(GameObject *go, uint32 spellId, bool triggered, Item *castI } // Obsolete func need remove, here only for comotability vs another patches -uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell, bool useSpellDamage) +uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage) { SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID); SpellNonMeleeDamage damageInfo(this, pVictim, spellInfo->Id, spellInfo->SchoolMask); @@ -2601,7 +2601,7 @@ void Unit::SendAttackStop(Unit* victim) ((Creature*)victim)->AI().EnterEvadeMode(this);*/ } -bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const *spellProto, WeaponAttackType attackType) +bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, WeaponAttackType attackType) { if (pVictim->HasInArc(M_PI,this)) { @@ -4986,7 +4986,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger break; } return false; - }/**/ + }*/ // Sunwell Exalted Caster Neck (Shattered Sun Pendant of Acumen neck) // cast 45479 Light's Wrath if Exalted by Aldor // cast 45429 Arcane Bolt if Exalted by Scryers @@ -11148,6 +11148,7 @@ Powers Unit::GetPowerTypeByAuraGroup(UnitMods unitMod) const case UNIT_MOD_HAPPINESS: return POWER_HAPPINESS; case UNIT_MOD_RUNE: return POWER_RUNE; case UNIT_MOD_RUNIC_POWER:return POWER_RUNIC_POWER; + default: return POWER_MANA; } return POWER_MANA; @@ -11367,6 +11368,8 @@ uint32 Unit::GetCreatePowers( Powers power ) const case POWER_ENERGY: return 100; case POWER_HAPPINESS: return (GetTypeId()==TYPEID_PLAYER || !((Creature const*)this)->isPet() || ((Pet const*)this)->getPetType()!=HUNTER_PET ? 0 : 1050000); case POWER_RUNIC_POWER: return 1000; + case POWER_RUNE: return 0; + case POWER_HEALTH: return 0; } return 0; diff --git a/src/game/Unit.h b/src/game/Unit.h index 8100da3358e..6e6c42706b7 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -1176,7 +1176,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, bool critical, int32 gain); void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype); - uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell = false, bool useSpellDamage = true); + uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage); void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect* triggeredByAura = NULL, uint64 originalCaster = 0); void CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, AuraEffect* triggeredByAura = NULL, uint64 originalCaster = 0); void CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem = NULL, AuraEffect* triggeredByAura = NULL, uint64 originalCaster = 0); diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp index 8eb8278d071..b9c1ec04c63 100644 --- a/src/game/UpdateData.cpp +++ b/src/game/UpdateData.cpp @@ -103,7 +103,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size) *dst_size = c_stream.total_out; } -bool UpdateData::BuildPacket(WorldPacket *packet, bool hasTransport) +bool UpdateData::BuildPacket(WorldPacket *packet, bool /*hasTransport*/) { ByteBuffer buf(m_data.size() + 10 + m_outOfRangeGUIDs.size()*8); |