feat(CI/Codestyle): added codestyle check (#3668)
This commit is contained in:
Kargatum
GitHub
parent
57aa46244d
commit
ea93a5c1a1
400 changed files with 238 additions and 748 deletions
|
|
@ -113,7 +113,7 @@ extern int main(int argc, char** argv)
|
|||
sLog->outString(" ╚██████╗╚██████╔╝██║ ██║███████╗");
|
||||
sLog->outString(" ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚══════╝\n");
|
||||
|
||||
sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n");
|
||||
sLog->outString(" AzerothCore 3.3.5a - www.azerothcore.org\n");
|
||||
|
||||
sLog->outString("Using configuration file %s.", configFile);
|
||||
|
||||
|
|
|
|||
|
|
@ -580,7 +580,6 @@ bool AuthSocket::_HandleLogonChallenge()
|
|||
for (int i = 0; i < 4; ++i)
|
||||
_localizationName[i] = ch->country[4 - i - 1];
|
||||
|
||||
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
sLog->outDebug( LOG_FILTER_NETWORKIO, "'%s:%d' [AuthChallenge] account %s is using '%c%c%c%c' locale (%u)", socket().getRemoteAddress().c_str(), socket().getRemotePort(), _login.c_str (), ch->country[3], ch->country[2], ch->country[1], ch->country[0], GetLocaleByName(_localizationName) );
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -242,7 +242,6 @@ WrongPass.BanType = 0
|
|||
|
||||
WrongPass.Logging = 0
|
||||
|
||||
|
||||
#
|
||||
###################################################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ public:
|
|||
void AttackStart(Unit* who) override;
|
||||
void UpdateAI(uint32 diff) override;
|
||||
|
||||
|
||||
static int Permissible(Creature const* /*creature*/) { return PERMIT_BASE_NO; }
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -74,4 +74,3 @@ public:
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -47,4 +47,3 @@ protected:
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -296,7 +296,6 @@ bool SpellTargetSelector::operator()(Unit const* target) const
|
|||
float max_range = _caster->GetSpellMaxRangeForTarget(target, _spellInfo);
|
||||
float min_range = _caster->GetSpellMinRangeForTarget(target, _spellInfo);
|
||||
|
||||
|
||||
if (target && target != _caster)
|
||||
{
|
||||
if (range_type == SPELL_RANGE_MELEE)
|
||||
|
|
|
|||
|
|
@ -111,7 +111,6 @@ struct PowerUsersSelector : public acore::unary_function<Unit*, bool>
|
|||
float const _dist;
|
||||
bool const _playerOnly;
|
||||
|
||||
|
||||
PowerUsersSelector(Unit const* unit, Powers power, float dist, bool playerOnly) : _me(unit), _power(power), _dist(dist), _playerOnly(playerOnly) { }
|
||||
|
||||
bool operator()(Unit const* target) const
|
||||
|
|
|
|||
|
|
@ -55,4 +55,3 @@ struct AISpellInfoType
|
|||
AISpellInfoType* GetAISpellInfo(uint32 i);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -44,4 +44,3 @@ namespace AIRegistry
|
|||
(new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,4 +12,3 @@ namespace AIRegistry
|
|||
void Initialize(void);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -139,4 +139,3 @@ namespace FactorySelector
|
|||
return (ai_factory == NULL ? new NullGameObjectAI(go) : ai_factory->Create(go));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,4 +20,3 @@ namespace FactorySelector
|
|||
GameObjectAI* SelectGameObjectAI(GameObject*);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -126,4 +126,3 @@ private:
|
|||
bool HasImmuneToNPCFlags;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -450,7 +450,6 @@ void SmartAI::UpdatePath(const uint32 diff)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void SmartAI::CheckConditions(const uint32 diff)
|
||||
{
|
||||
Vehicle* vehicle = me->GetVehicleKit();
|
||||
|
|
|
|||
|
|
@ -121,7 +121,6 @@ namespace AccountMgr
|
|||
return AOR_OK;
|
||||
}
|
||||
|
||||
|
||||
AccountOpResult ChangeUsername(uint32 accountId, std::string newUsername, std::string newPassword)
|
||||
{
|
||||
// Check if accounts exists
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ struct AchievementCriteriaData
|
|||
};
|
||||
uint32 ScriptId;
|
||||
|
||||
AchievementCriteriaData()
|
||||
AchievementCriteriaData()
|
||||
{
|
||||
raw.value1 = 0;
|
||||
raw.value2 = 0;
|
||||
|
|
|
|||
|
|
@ -56,4 +56,3 @@ namespace AddonMgr
|
|||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,6 @@ bool Battlefield::Update(uint32 diff)
|
|||
objective_changed = true;
|
||||
}
|
||||
|
||||
|
||||
if (m_LastResurectTimer <= diff)
|
||||
{
|
||||
for (uint8 i = 0; i < m_GraveyardList.size(); i++)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@ enum BattlefieldTimers
|
|||
BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL = 1000
|
||||
};
|
||||
|
||||
|
||||
const uint32 BattlefieldFactions[BG_TEAMS_COUNT] =
|
||||
{
|
||||
1732, // Alliance
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ bool BattlefieldWG::SetupBattlefield()
|
|||
m_GraveyardList[i] = graveyard;
|
||||
}
|
||||
|
||||
|
||||
// Spawn workshop creatures and gameobjects
|
||||
for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++)
|
||||
{
|
||||
|
|
@ -223,7 +222,6 @@ void BattlefieldWG::OnBattleStart()
|
|||
else
|
||||
sLog->outError("WG: Failed to spawn titan relic.");
|
||||
|
||||
|
||||
// Update tower visibility and update faction
|
||||
for (GuidSet::const_iterator itr = CanonList.begin(); itr != CanonList.end(); ++itr)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -25,14 +25,12 @@ typedef std::set<WGWorkshop*> Workshop;
|
|||
typedef std::set<Group*> GroupSet;
|
||||
//typedef std::set<WintergraspCapturePoint *> CapturePointSet; unused ?
|
||||
|
||||
|
||||
const uint32 VehNumWorldState[2] = { 3680, 3490 };
|
||||
const uint32 MaxVehNumWorldState[2] = { 3681, 3491 };
|
||||
const uint32 ClockWorldState[2] = { 3781, 4354 };
|
||||
const uint32 WintergraspFaction[3] = { 1, 2, 35 };
|
||||
float const WintergraspStalkerPos[4] = { 4948.985f, 2937.789f, 550.5172f, 1.815142f };
|
||||
|
||||
|
||||
enum WintergraspSpells
|
||||
{
|
||||
// Wartime auras
|
||||
|
|
|
|||
|
|
@ -191,4 +191,3 @@ protected:
|
|||
ArenaTeamStats Stats;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(const std::string& arenaTeamName) co
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
ArenaTeam* ArenaTeamMgr::GetArenaTeamByName(std::string const& arenaTeamName, const uint32 type) const
|
||||
{
|
||||
std::string search = arenaTeamName;
|
||||
|
|
@ -91,7 +90,6 @@ ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(uint64 guid) const
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
ArenaTeam* ArenaTeamMgr::GetArenaTeamByCaptain(uint64 guid, const uint32 type) const
|
||||
{
|
||||
for (ArenaTeamContainer::const_iterator itr = ArenaTeamStore.begin(); itr != ArenaTeamStore.end(); ++itr)
|
||||
|
|
|
|||
|
|
@ -714,7 +714,6 @@ uint32 Battleground::GetRealRepFactionForPlayer(uint32 factionId, Player* player
|
|||
return factionId;
|
||||
}
|
||||
|
||||
|
||||
void Battleground::UpdateWorldState(uint32 Field, uint32 Value)
|
||||
{
|
||||
WorldPacket data;
|
||||
|
|
|
|||
|
|
@ -384,7 +384,6 @@ void BattlegroundQueue::FillPlayersToBG(Battleground* bg, const int32 aliFree, c
|
|||
auto Ali_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].begin();
|
||||
for (; Ali_itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_ALLIANCE].end() && m_SelectionPools[TEAM_ALLIANCE].AddGroup((*Ali_itr), aliFree); ++Ali_itr);
|
||||
|
||||
|
||||
// horde: at first fill as much as possible
|
||||
auto Horde_itr = m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].begin();
|
||||
for (; Horde_itr != m_QueuedGroups[bracket_id][BG_QUEUE_NORMAL_HORDE].end() && m_SelectionPools[TEAM_HORDE].AddGroup((*Horde_itr), hordeFree); ++Horde_itr);
|
||||
|
|
|
|||
|
|
@ -277,4 +277,3 @@ private:
|
|||
bool _teamScores500Disadvantage[BG_TEAMS_COUNT] {};
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -396,4 +396,3 @@ private:
|
|||
uint32 _flagCapturedObject;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -795,7 +795,6 @@ GraveyardStruct const* BattlegroundSA::GetClosestGraveyard(Player* player)
|
|||
if (!closest && GraveyardStatus[BG_SA_BEACH_GY] == player->GetTeamId())
|
||||
return sGraveyard->GetGraveyard(BG_SA_GYEntries[BG_SA_BEACH_GY]);
|
||||
|
||||
|
||||
return closest;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -405,7 +405,6 @@ bool BattlegroundWS::SetupBattleground()
|
|||
AddObject(BG_WS_OBJECT_DOOR_H_3, BG_OBJECT_DOOR_H_3_WS_ENTRY, 949.9523f, 1422.751f, 344.9273f, 0.0f, 0, 0, 0, 1, RESPAWN_IMMEDIATELY);
|
||||
AddObject(BG_WS_OBJECT_DOOR_H_4, BG_OBJECT_DOOR_H_4_WS_ENTRY, 950.7952f, 1459.583f, 342.1523f, 0.05235988f, 0, 0, 0.02617695f, 0.9996573f, RESPAWN_IMMEDIATELY);
|
||||
|
||||
|
||||
GraveyardStruct const* sg = sGraveyard->GetGraveyard(WS_GRAVEYARD_MAIN_ALLIANCE);
|
||||
AddSpiritGuide(WS_SPIRIT_MAIN_ALLIANCE, sg->x, sg->y, sg->z, 3.124139f, TEAM_ALLIANCE);
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@ enum BG_WS_CreatureTypes
|
|||
BG_CREATURES_MAX_WS = 2
|
||||
};
|
||||
|
||||
|
||||
enum BG_WS_Objectives
|
||||
{
|
||||
WS_OBJECTIVE_CAPTURE_FLAG = 42,
|
||||
|
|
|
|||
|
|
@ -333,4 +333,3 @@ private:
|
|||
PlayersWatchingContainer playersWatchingStore;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ Channel* ChannelMgr::GetChannel(std::string const& name, Player* player, bool pk
|
|||
return i->second;
|
||||
}
|
||||
|
||||
|
||||
uint32 ChannelMgr::_channelIdMax = 0;
|
||||
ChannelMgr::ChannelRightsMap ChannelMgr::channels_rights;
|
||||
ChannelRights ChannelMgr::channelRightsEmpty;
|
||||
|
|
|
|||
|
|
@ -161,5 +161,4 @@ private:
|
|||
std::istringstream _iss;
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -62,4 +62,3 @@ public:
|
|||
};
|
||||
//=================================================
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -122,4 +122,3 @@ public:
|
|||
|
||||
//==============================================================
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -464,8 +464,6 @@ void LoadDBCStores(const std::string& dataPath)
|
|||
if (TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i))
|
||||
sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID, entry->price);
|
||||
|
||||
|
||||
|
||||
// Calculate path nodes count
|
||||
uint32 pathCount = sTaxiPathStore.GetNumRows();
|
||||
std::vector<uint32> pathLength;
|
||||
|
|
|
|||
|
|
@ -95,4 +95,3 @@ namespace lfg
|
|||
}
|
||||
|
||||
} // namespace lfg
|
||||
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@ namespace lfg
|
|||
guid[2] = guid[1];
|
||||
}
|
||||
|
||||
|
||||
guid[1] = guid[0];
|
||||
guid[0] = g;
|
||||
|
||||
|
|
@ -479,7 +478,6 @@ namespace lfg
|
|||
std::string GetRolesString(uint8 roles);
|
||||
std::string GetStateString(LfgState state);
|
||||
|
||||
|
||||
} // namespace lfg
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -424,7 +424,6 @@ namespace lfg
|
|||
lockData = LFG_LOCKSTATUS_MISSING_ITEM;
|
||||
}
|
||||
|
||||
|
||||
sScriptMgr->OnInitializeLockedDungeons(player, level, lockData);
|
||||
|
||||
/* TODO VoA closed if WG is not under team control (LFG_LOCKSTATUS_RAID_LOCKED)
|
||||
|
|
|
|||
|
|
@ -615,7 +615,6 @@ void Creature::Update(uint32 diff)
|
|||
m_moveBackwardsMovementTime = MOVE_BACKWARDS_CHECK_INTERVAL;
|
||||
}
|
||||
|
||||
|
||||
if (!IsInEvadeMode() && IsAIEnabled)
|
||||
{
|
||||
// do not allow the AI to be changed during update
|
||||
|
|
@ -791,7 +790,6 @@ void Creature::RegenerateHealth()
|
|||
addvalue = uint32(Spirit * 0.80 * HealthIncreaseRate);
|
||||
}
|
||||
|
||||
|
||||
// Apply modifiers (if any).
|
||||
AuraEffectList const& ModPowerRegenPCTAuras = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT);
|
||||
for (AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
|
||||
|
|
@ -1364,7 +1362,6 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, const
|
|||
else
|
||||
CreateVehicleKit(vehId, Entry);
|
||||
|
||||
|
||||
if (!UpdateEntry(Entry, data))
|
||||
return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1190,7 +1190,6 @@ GameObject* GameObject::LookupFishingHoleAround(float range)
|
|||
{
|
||||
GameObject* ok = nullptr;
|
||||
|
||||
|
||||
CellCoord p(acore::ComputeCellCoord(GetPositionX(), GetPositionY()));
|
||||
Cell cell(p);
|
||||
acore::NearestGameObjectFishingHole u_check(*this, range);
|
||||
|
|
|
|||
|
|
@ -230,4 +230,3 @@ Item* Bag::GetItemByPos(uint8 slot) const
|
|||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -59,4 +59,3 @@ inline Item* NewItemOrBag(ItemTemplate const* proto)
|
|||
return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -188,4 +188,3 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,3 @@ void LoadRandomEnchantmentsTable();
|
|||
uint32 GetItemEnchantMod(int32 entry);
|
||||
uint32 GenerateEnchSuffixFactor(uint32 item_id);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1845,7 +1845,6 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj, bool checkAlert) co
|
|||
if (checkAlert)
|
||||
visibilityRange += (visibilityRange * 0.08f) + 1.5f;
|
||||
|
||||
|
||||
Unit const* targetUnit = obj->ToUnit();
|
||||
|
||||
// If checking for alert, and creature's visibility range is greater than aggro distance, No alert
|
||||
|
|
@ -2623,7 +2622,6 @@ void WorldObject::GetContactPoint(const WorldObject* obj, float& x, float& y, fl
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void WorldObject::GetChargeContactPoint(const WorldObject* obj, float& x, float& y, float& z, float distance2d) const
|
||||
{
|
||||
// angle to face `obj` to `this` using distance includes size of `obj`
|
||||
|
|
@ -2985,7 +2983,6 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/)
|
|||
SendMessageToSet(&data, true);
|
||||
}
|
||||
|
||||
|
||||
void WorldObject::PlayDirectMusic(uint32 music_id, Player* target /*= NULL*/)
|
||||
{
|
||||
WorldPacket data(SMSG_PLAY_MUSIC, 4);
|
||||
|
|
|
|||
|
|
@ -485,7 +485,6 @@ struct Position
|
|||
|
||||
[[nodiscard]] Position GetPosition() const { return *this; }
|
||||
|
||||
|
||||
Position::PositionXYZStreamer PositionXYZStream()
|
||||
{
|
||||
return PositionXYZStreamer(*this);
|
||||
|
|
@ -593,7 +592,6 @@ ByteBuffer& operator >> (ByteBuffer& buf, Position::PositionXYZStreamer const& s
|
|||
ByteBuffer& operator<<(ByteBuffer& buf, Position::PositionXYZOStreamer const& streamer);
|
||||
ByteBuffer& operator >> (ByteBuffer& buf, Position::PositionXYZOStreamer const& streamer);
|
||||
|
||||
|
||||
struct MovementInfo
|
||||
{
|
||||
// common
|
||||
|
|
|
|||
|
|
@ -142,4 +142,3 @@ void UpdateData::Clear()
|
|||
m_outOfRangeGUIDs.clear();
|
||||
m_blockCount = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -55,4 +55,3 @@ protected:
|
|||
void Compress(void* dst, uint32* dst_size, void* src, int src_size);
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -2155,7 +2155,6 @@ void Pet::HandleAsynchLoadSucceed()
|
|||
if (spell->GetSpellInfo()->HasEffect(SPELL_EFFECT_SUMMON_PET))
|
||||
CastSpell(this, 32752, true, nullptr, nullptr, GetGUID());
|
||||
|
||||
|
||||
if (owner->NeedSendSpectatorData() && GetCreatureTemplate()->family)
|
||||
{
|
||||
ArenaSpectator::SendCommand_UInt32Value(owner->FindMap(), owner->GetGUID(), "PHP", (uint32)GetHealthPct());
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ struct PetSpell
|
|||
PetSpellType type;
|
||||
};
|
||||
|
||||
|
||||
class AsynchPetSummon
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -7577,7 +7577,6 @@ uint32 Player::GetArenaTeamIdFromStorage(uint32 guid, uint8 slot)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void Player::SetArenaTeamInfoField(uint8 slot, ArenaTeamInfoType type, uint32 value)
|
||||
{
|
||||
if (slot < MAX_ARENA_SLOT)
|
||||
|
|
@ -8287,7 +8286,6 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply
|
|||
if (CanUseAttackType(attType))
|
||||
_ApplyWeaponDamage(slot, proto, ssv, apply);
|
||||
|
||||
|
||||
// Druids get feral AP bonus from weapon dps (also use DPS from ScalingStatValue)
|
||||
if (getClass() == CLASS_DRUID)
|
||||
{
|
||||
|
|
@ -12645,7 +12643,6 @@ Item* Player::StoreNewItem(ItemPosCountVec const& dest, uint32 item, bool update
|
|||
UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, item, count);
|
||||
pItem = StoreItem(dest, pItem, update);
|
||||
|
||||
|
||||
if (allowedLooters.size() > 1 && pItem->GetTemplate()->GetMaxStackSize() == 1 && pItem->IsSoulBound())
|
||||
{
|
||||
pItem->SetSoulboundTradeable(allowedLooters);
|
||||
|
|
@ -19145,7 +19142,6 @@ void Player::_LoadMail()
|
|||
m->stationery = fields[12].GetUInt8();
|
||||
m->mailTemplateId = fields[13].GetInt16();
|
||||
|
||||
|
||||
if (m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId))
|
||||
{
|
||||
sLog->outError("Player::_LoadMail - Mail (%u) have not existed MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId);
|
||||
|
|
@ -21638,7 +21634,6 @@ void Player::LeaveAllArenaTeams(uint64 guid)
|
|||
} while (result->NextRow());
|
||||
}
|
||||
|
||||
|
||||
uint32 Player::GetArenaTeamId(uint8 slot) const
|
||||
{
|
||||
uint32 rtVal = 0;
|
||||
|
|
@ -21654,7 +21649,6 @@ uint32 Player::GetArenaTeamId(uint8 slot) const
|
|||
return rtVal;
|
||||
}
|
||||
|
||||
|
||||
uint32 Player::GetArenaPersonalRating(uint8 slot) const
|
||||
{
|
||||
uint32 rtVal = 0;
|
||||
|
|
@ -23224,7 +23218,6 @@ void Player::AddComboPoints(Unit* target, int8 count)
|
|||
else if (*comboPoints < 0)
|
||||
*comboPoints = 0;
|
||||
|
||||
|
||||
SendComboPoints();
|
||||
}
|
||||
|
||||
|
|
@ -24730,7 +24723,6 @@ void Player::UpdateUnderwaterState(Map* m, float x, float y, float z)
|
|||
_lastLiquid = nullptr;
|
||||
}
|
||||
|
||||
|
||||
// All liquids type - check under water position
|
||||
if (liquid_status.type_flags & (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME))
|
||||
{
|
||||
|
|
@ -25568,7 +25560,6 @@ uint32 Player::GetPhaseMaskForSpawn() const
|
|||
if (!phase)
|
||||
phase = PHASEMASK_NORMAL;
|
||||
|
||||
|
||||
// some aura phases include 1 normal map in addition to phase itself
|
||||
uint32 n_phase = phase & ~PHASEMASK_NORMAL;
|
||||
if (n_phase > 0)
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ class SocialMgr
|
|||
private:
|
||||
SocialMgr();
|
||||
~SocialMgr();
|
||||
|
||||
|
||||
public:
|
||||
static SocialMgr* instance();
|
||||
// Misc
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ void Totem::InitStats(uint32 duration)
|
|||
if (totemSpell->CalcCastTime()) // If spell has cast time -> its an active totem
|
||||
m_type = TOTEM_ACTIVE;
|
||||
|
||||
|
||||
m_duration = duration;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1101,8 +1101,6 @@ void Creature::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized,
|
|||
######## ########
|
||||
#######################################*/
|
||||
|
||||
|
||||
|
||||
bool Guardian::UpdateStats(Stats stat)
|
||||
{
|
||||
if (stat >= MAX_STATS)
|
||||
|
|
|
|||
|
|
@ -1764,7 +1764,6 @@ float Unit::GetEffectiveResistChance(Unit const* owner, SpellSchoolMask schoolMa
|
|||
if (owner)
|
||||
victimResistance += std::max((float(victim->getLevel()) - float(owner->getLevel())) * 5.0f, 0.0f);
|
||||
|
||||
|
||||
static uint32 const BOSS_LEVEL = 83;
|
||||
static float const BOSS_RESISTANCE_CONSTANT = 510.0f;
|
||||
uint32 level = victim->getLevel();
|
||||
|
|
@ -9056,7 +9055,6 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// Custom basepoints/target for exist spell
|
||||
// dummy basepoints or other customs
|
||||
switch (trigger_spell_id)
|
||||
|
|
@ -9452,7 +9450,6 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
void Unit::setPowerType(Powers new_powertype)
|
||||
{
|
||||
SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype);
|
||||
|
|
@ -9565,7 +9562,6 @@ ReputationRank Unit::GetReactionTo(Unit const* target) const
|
|||
return *repRank;
|
||||
}
|
||||
|
||||
|
||||
if (HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE))
|
||||
{
|
||||
if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE))
|
||||
|
|
@ -11154,7 +11150,6 @@ uint32 Unit::SpellDamageBonusTaken(Unit* caster, SpellInfo const* spellProto, ui
|
|||
if (spellProto->ValidateAttribute6SpellDamageMods(caster, *i, damagetype == DOT))
|
||||
AddPct(TakenTotalMod, (*i)->GetAmount());
|
||||
|
||||
|
||||
// .. taken pct: dummy auras
|
||||
AuraEffectList const& mDummyAuras = GetAuraEffectsByType(SPELL_AURA_DUMMY);
|
||||
for (AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
|
||||
|
|
@ -14315,7 +14310,6 @@ float Unit::GetSpellMinRangeForTarget(Unit const* target, SpellInfo const* spell
|
|||
return spellInfo->GetMinRange(!IsHostileTo(target));
|
||||
}
|
||||
|
||||
|
||||
uint32 Unit::GetCreatureType() const
|
||||
{
|
||||
if (GetTypeId() == TYPEID_PLAYER)
|
||||
|
|
@ -17879,7 +17873,6 @@ bool Unit::IsInRaidWith(Unit const* unit) const
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
void Unit::GetPartyMembers(std::list<Unit*>& TagUnitMap)
|
||||
{
|
||||
Unit* owner = GetCharmerOrOwnerOrSelf();
|
||||
|
|
|
|||
|
|
@ -171,4 +171,3 @@ bool IsHolidayActive(HolidayIds id);
|
|||
bool IsEventActive(uint16 event_id);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -530,7 +530,6 @@ void ObjectAccessor::UnloadAll()
|
|||
|
||||
std::map<std::string, Player*> ObjectAccessor::playerNameToPlayerPointer;
|
||||
|
||||
|
||||
/// Global definitions for the hashmap storage
|
||||
|
||||
template class HashMapHolder<Player>;
|
||||
|
|
|
|||
|
|
@ -492,7 +492,6 @@ void ObjectMgr::LoadCreatureTemplates()
|
|||
|
||||
uint32 entry = fields[0].GetUInt32();
|
||||
|
||||
|
||||
CreatureTemplate& creatureTemplate = _creatureTemplateStore[entry];
|
||||
|
||||
creatureTemplate.Entry = entry;
|
||||
|
|
|
|||
|
|
@ -421,7 +421,7 @@ struct AreaTrigger
|
|||
|
||||
struct BroadcastText
|
||||
{
|
||||
BroadcastText()
|
||||
BroadcastText()
|
||||
{
|
||||
MaleText.resize(DEFAULT_LOCALE + 1);
|
||||
FemaleText.resize(DEFAULT_LOCALE + 1);
|
||||
|
|
|
|||
|
|
@ -103,4 +103,3 @@ private:
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -166,4 +166,3 @@ inline void Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER>& visitor, Map&
|
|||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -120,4 +120,3 @@ private:
|
|||
//ActiveGridObjects m_activeGridObjects;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -63,4 +63,3 @@ class GridLoader
|
|||
};
|
||||
*/
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -27,4 +27,3 @@ public:
|
|||
iterator rend() { return iterator(nullptr); }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -38,4 +38,3 @@ public:
|
|||
GridReference* next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -101,4 +101,3 @@ private:
|
|||
bool i_GridObjectDataLoaded;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
using namespace acore;
|
||||
|
||||
|
||||
void VisibleNotifier::Visit(GameObjectMapType& m)
|
||||
{
|
||||
for (GameObjectMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
|
||||
|
|
|
|||
|
|
@ -151,7 +151,6 @@ void acore::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType& m)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
template<class Check>
|
||||
void acore::WorldObjectLastSearcher<Check>::Visit(GameObjectMapType& m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ bool Group::Create(Player* leader)
|
|||
|
||||
CharacterDatabase.Execute(stmt);
|
||||
|
||||
|
||||
ASSERT(AddMember(leader)); // If the leader can't be added to a new group because it appears full, something is clearly wrong.
|
||||
}
|
||||
else if (!AddMember(leader))
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ public:
|
|||
void AddGroup(Group* group);
|
||||
void RemoveGroup(Group* group);
|
||||
|
||||
|
||||
protected:
|
||||
typedef std::vector<bool> GroupIds;
|
||||
GroupIds _groupIds;
|
||||
|
|
|
|||
|
|
@ -20,4 +20,3 @@ public:
|
|||
GroupReference const* getFirst() const { return ((GroupReference const*)RefManager<Group, Player>::getFirst()); }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -22,4 +22,3 @@ void GroupReference::sourceObjectDestroyLink()
|
|||
{
|
||||
// called from invalidate()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,4 +28,3 @@ public:
|
|||
void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -471,7 +471,6 @@ bool Guild::BankTab::WriteSlotPacket(WorldPacket& data, uint8 slotId, bool ignor
|
|||
{
|
||||
data << uint32(0); // 3.3.0 (0x00018020, 0x00018000)
|
||||
|
||||
|
||||
if (uint32 random = pItem->GetItemRandomPropertyId())
|
||||
{
|
||||
data << uint32(random); // Random item property id
|
||||
|
|
@ -1306,7 +1305,6 @@ void Guild::HandleRoster(WorldSession* session)
|
|||
for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
|
||||
itr->second->WritePacket(data, _HasRankRight(session->GetPlayer(), GR_RIGHT_VIEWOFFNOTE));
|
||||
|
||||
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
sLog->outDebug(LOG_FILTER_GUILD, "SMSG_GUILD_ROSTER [%s]", session->GetPlayerInfo().c_str());
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -666,7 +666,6 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData)
|
|||
_player->m_Events.AddEvent(new AuctionListOwnerItemsDelayEvent(guid, _player->GetGUID(), true), _player->m_Events.CalculateTime(delay - diff));
|
||||
}
|
||||
|
||||
|
||||
void WorldSession::HandleAuctionListOwnerItemsEvent(uint64 creatureGuid)
|
||||
{
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
|
|
|
|||
|
|
@ -715,7 +715,6 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData)
|
|||
member->RemoveBattlegroundQueueId(mqtid);
|
||||
}
|
||||
|
||||
|
||||
uint32 ateamId = 0;
|
||||
uint32 arenaRating = 0;
|
||||
uint32 matchmakerRating = 0;
|
||||
|
|
|
|||
|
|
@ -433,7 +433,6 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
ASSERT(_charCreateCallback.GetParam() == createInfo);
|
||||
|
||||
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_SUM_CHARS);
|
||||
|
|
@ -946,7 +945,6 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder)
|
|||
pCurrChar->SetRank(0);
|
||||
}
|
||||
|
||||
|
||||
data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4 + 4);
|
||||
data << uint32(0);
|
||||
data << uint32(0);
|
||||
|
|
@ -1139,7 +1137,6 @@ void WorldSession::HandlePlayerLoginFromDB(LoginQueryHolder* holder)
|
|||
|
||||
m_playerLoading = false;
|
||||
|
||||
|
||||
// Handle Login-Achievements (should be handled after loading)
|
||||
_player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ON_LOGIN, 1);
|
||||
|
||||
|
|
|
|||
|
|
@ -564,7 +564,6 @@ void WorldSession::HandleGuildBankBuyTab(WorldPacket& recvData)
|
|||
sLog->outDebug(LOG_FILTER_GUILD, "CMSG_GUILD_BANK_BUY_TAB [%s]: Go: [" UI64FMTD "], TabId: %u", GetPlayerInfo().c_str(), guid, tabId);
|
||||
#endif
|
||||
|
||||
|
||||
if (GetPlayer()->GetGameObjectIfCanInteractWith(guid, GAMEOBJECT_TYPE_GUILD_BANK))
|
||||
if (Guild* guild = GetPlayer()->GetGuild())
|
||||
guild->HandleBuyBankTab(this, tabId);
|
||||
|
|
|
|||
|
|
@ -411,7 +411,6 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData)
|
|||
// sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Send SMSG_WHO Message");
|
||||
}
|
||||
|
||||
|
||||
void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/)
|
||||
{
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
|
|
@ -612,7 +611,6 @@ void WorldSession::HandleBugOpcode(WorldPacket& recv_data)
|
|||
|
||||
recv_data >> typelen >> type;
|
||||
|
||||
|
||||
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
|
||||
if (suggestion == 0)
|
||||
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUG [Bug Report]");
|
||||
|
|
|
|||
|
|
@ -477,7 +477,6 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvData)
|
|||
if (opcode == MSG_MOVE_FALL_LAND || opcode == MSG_MOVE_START_SWIM)
|
||||
mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_LANDING); // Parachutes
|
||||
|
||||
|
||||
if (plrMover) // nothing is charmed, or player charmed
|
||||
{
|
||||
if (plrMover->IsSitState() && (movementInfo.flags & (MOVEMENTFLAG_MASK_MOVING | MOVEMENTFLAG_MASK_TURNING)))
|
||||
|
|
|
|||
|
|
@ -1038,4 +1038,3 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket& recvData)
|
|||
_player->DurabilityRepairAll(true, discountMod, guildBank);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,4 +45,3 @@ struct NpcTextLocale
|
|||
std::vector<StringVector> Text_1;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -508,7 +508,6 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid
|
|||
if (pet->ToPet())
|
||||
pet->ToPet()->ClearCastWhenWillAvailable();
|
||||
|
||||
|
||||
charmInfo->SetForcedSpell(0);
|
||||
charmInfo->SetForcedTargetGUID(0);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -425,7 +425,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData)
|
|||
recvData >> petitionGuid; // petition guid
|
||||
recvData >> unk;
|
||||
|
||||
|
||||
Petition const* petition = sPetitionMgr->GetPetition(GUID_LOPART(petitionGuid));
|
||||
if (!petition)
|
||||
{
|
||||
|
|
@ -492,7 +491,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
uint32 signs = signatures->signatureMap.size();
|
||||
if (++signs > type) // client signs maximum
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
|
||||
*/
|
||||
|
||||
|
||||
#include "WorldSession.h"
|
||||
#include "AccountMgr.h"
|
||||
#include "Log.h"
|
||||
|
|
|
|||
|
|
@ -153,7 +153,6 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
|
|||
targets.Read(recvPacket, pUser);
|
||||
HandleClientCastFlags(recvPacket, castFlags, targets);
|
||||
|
||||
|
||||
// Note: If script stop casting it must send appropriate data to client to prevent stuck item in gray state.
|
||||
if (!sScriptMgr->OnItemUse(pUser, pItem, targets))
|
||||
{
|
||||
|
|
@ -260,7 +259,6 @@ void WorldSession::HandleOpenWrappedItemCallback(PreparedQueryResult result, uin
|
|||
if (item->GetGUIDLow() != itemLowGUID || !item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_WRAPPED)) // during getting result, gift was swapped with another item
|
||||
return;
|
||||
|
||||
|
||||
if (!result)
|
||||
{
|
||||
sLog->outError("Wrapped item %u don't have record in character_gifts table and will deleted", item->GetGUIDLow());
|
||||
|
|
|
|||
|
|
@ -36,4 +36,3 @@ void WorldSession::HandleSetActiveVoiceChannel(WorldPacket& recvData)
|
|||
recvData.read_skip<uint32>();
|
||||
recvData.read_skip<char*>();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -400,7 +400,6 @@ void Map::DeleteFromWorld(Player* player)
|
|||
delete player;
|
||||
}
|
||||
|
||||
|
||||
void Map::EnsureGridCreated(const GridCoord& p)
|
||||
{
|
||||
if (getNGrid(p.x_coord, p.y_coord)) // pussywizard
|
||||
|
|
@ -628,7 +627,6 @@ bool Map::IsGridLoaded(const GridCoord& p) const
|
|||
return (getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord));
|
||||
}
|
||||
|
||||
|
||||
void Map::VisitNearbyCellsOfPlayer(Player* player, TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer>& gridVisitor,
|
||||
TypeContainerVisitor<acore::ObjectUpdater, WorldTypeMapContainer>& worldVisitor,
|
||||
TypeContainerVisitor<acore::ObjectUpdater, GridTypeMapContainer>& largeGridVisitor,
|
||||
|
|
@ -1993,7 +1991,6 @@ float Map::GetMinHeight(float x, float y) const
|
|||
return -500.0f;
|
||||
}
|
||||
|
||||
|
||||
inline bool IsOutdoorWMO(uint32 mogpFlags, int32 /*adtId*/, int32 /*rootId*/, int32 /*groupId*/, WMOAreaTableEntry const* wmoEntry, AreaTableEntry const* atEntry)
|
||||
{
|
||||
bool outdoor = true;
|
||||
|
|
@ -3477,7 +3474,6 @@ bool Map::CanReachPositionAndGetCoords(Unit* who, float startX, float startY, fl
|
|||
destZ = _map->GetHeight(who->GetPhaseMask(), destX, destY, destZ, true);
|
||||
}
|
||||
|
||||
|
||||
if (destZ <= INVALID_HEIGHT || (destZ - startZ) > maxHeight)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -191,7 +191,6 @@ class GridMap
|
|||
uint8 _liquidWidth;
|
||||
uint8 _liquidHeight;
|
||||
|
||||
|
||||
bool loadAreaData(FILE* in, uint32 offset, uint32 size);
|
||||
bool loadHeightData(FILE* in, uint32 offset, uint32 size);
|
||||
bool loadLiquidData(FILE* in, uint32 offset, uint32 size);
|
||||
|
|
@ -666,7 +665,6 @@ private:
|
|||
uint32 _defaultLight;
|
||||
};
|
||||
|
||||
|
||||
enum InstanceResetMethod
|
||||
{
|
||||
INSTANCE_RESET_ALL, // reset all option under portrait, resets only normal 5-mans
|
||||
|
|
|
|||
|
|
@ -30,4 +30,3 @@ public:
|
|||
[[nodiscard]] const_iterator end() const { return const_iterator(nullptr); }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -38,4 +38,3 @@ public:
|
|||
[[nodiscard]] MapReference const* nocheck_prev() const { return (MapReference const*)Reference<Map, Player>::nocheck_prev(); }
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -96,7 +96,6 @@ enum AcoreStrings
|
|||
LANG_PVPSTATS_DISABLED = 81,
|
||||
// Free 82 - 95
|
||||
|
||||
|
||||
LANG_GUILD_RENAME_ALREADY_EXISTS = 96,
|
||||
LANG_GUILD_RENAME_DONE = 97,
|
||||
LANG_RENAME_PLAYER_ALREADY_EXISTS = 98,
|
||||
|
|
@ -879,7 +878,6 @@ enum AcoreStrings
|
|||
// Room for more level 4 1031-1099 not used
|
||||
LANG_ACCOUNT_PASS_TOO_LONG = 1031,
|
||||
|
||||
|
||||
// Level 3 (continue)
|
||||
LANG_ACCOUNT_SETADDON = 1100,
|
||||
LANG_MOTD_NEW = 1101,
|
||||
|
|
@ -1291,7 +1289,6 @@ enum AcoreStrings
|
|||
LANG_BAN_ACCOUNT_YOUBANNEDMESSAGE_WORLD = 11006,
|
||||
LANG_BAN_ACCOUNT_YOUPERMBANNEDMESSAGE_WORLD = 11007,
|
||||
|
||||
|
||||
LANG_NPCINFO_INHABIT_TYPE = 11008,
|
||||
LANG_NPCINFO_FLAGS_EXTRA = 11009,
|
||||
LANG_INSTANCE_LOGIN_GAMEMASTER_EXCEPTION = 11010,
|
||||
|
|
@ -1304,8 +1301,8 @@ enum AcoreStrings
|
|||
LANG_SELECT_PLAYER_OR_PET = 11016,
|
||||
|
||||
// Continue show Ban in world (ip)
|
||||
LANG_BAN_IP_YOUBANNEDMESSAGE_WORLD = 11017,
|
||||
LANG_BAN_IP_YOUPERMBANNEDMESSAGE_WORLD = 11018,
|
||||
LANG_BAN_IP_YOUBANNEDMESSAGE_WORLD = 11017,
|
||||
LANG_BAN_IP_YOUPERMBANNEDMESSAGE_WORLD = 11018,
|
||||
|
||||
LANG_MUTED_PLAYER = 30000, // Mute for player 2 hour
|
||||
|
||||
|
|
|
|||
|
|
@ -3588,7 +3588,6 @@ static_assert(sizeof(MmapTileHeader) == (sizeof(MmapTileHeader::mmapMagic) +
|
|||
sizeof(MmapTileHeader::usesLiquids) +
|
||||
sizeof(MmapTileHeader::padding)), "MmapTileHeader has uninitialized padding fields");
|
||||
|
||||
|
||||
enum NavTerrain
|
||||
{
|
||||
NAV_EMPTY = 0x00,
|
||||
|
|
|
|||
|
|
@ -36,4 +36,3 @@ private:
|
|||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ void TargetedMovementGeneratorMedium<T, D>::_setTargetLocation(T* owner, bool in
|
|||
float maxDist = MELEE_RANGE + owner->GetMeleeReach() + i_target->GetMeleeReach();
|
||||
if (!forceDest && (i_path->GetPathType() & PATHFIND_NOPATH || (!i_offset && !isPlayerPet && i_target->GetExactDistSq(i_path->GetActualEndPosition().x, i_path->GetActualEndPosition().y, i_path->GetActualEndPosition().z) > maxDist * maxDist)))
|
||||
{
|
||||
if (owner->GetTypeId() == TYPEID_UNIT)
|
||||
if (owner->GetTypeId() == TYPEID_UNIT)
|
||||
{
|
||||
owner->ToCreature()->SetCannotReachTarget(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace Movement
|
|||
|
||||
struct MoveSplineInitArgs
|
||||
{
|
||||
MoveSplineInitArgs(size_t path_capacity = 16)
|
||||
MoveSplineInitArgs(size_t path_capacity = 16)
|
||||
{
|
||||
path.reserve(path_capacity);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ Xinef
|
|||
#include "Log.h"
|
||||
#include "DatabaseEnv.h"
|
||||
|
||||
|
||||
PetitionMgr::PetitionMgr()
|
||||
{
|
||||
}
|
||||
|
|
@ -163,5 +162,3 @@ void PetitionMgr::RemoveSignaturesByPlayerAndType(uint32 playerGuid, uint8 type)
|
|||
itr->second.signatureMap.erase(signItr);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -388,7 +388,7 @@ protected:
|
|||
|
||||
struct QuestStatusData
|
||||
{
|
||||
QuestStatusData()
|
||||
QuestStatusData()
|
||||
{
|
||||
memset(ItemCount, 0, QUEST_ITEM_OBJECTIVES_COUNT * sizeof(uint16));
|
||||
memset(CreatureOrGOCount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint16));
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue