feat(Core/Misc): includes cleanup (#5953)

This commit is contained in:
Kargatum
2021-05-26 19:00:08 +07:00
committed by GitHub
parent 7d3129a737
commit 78e1719c80
46 changed files with 132 additions and 191 deletions
@@ -224,19 +224,19 @@ typedef std::unordered_map<uint16, CreatureBaseStats> CreatureBaseStatsContainer
struct CreatureLocale
{
StringVector Name;
StringVector Title;
std::vector<std::string> Name;
std::vector<std::string> Title;
};
struct GossipMenuItemsLocale
{
StringVector OptionText;
StringVector BoxText;
std::vector<std::string> OptionText;
std::vector<std::string> BoxText;
};
struct PointOfInterestLocale
{
StringVector Name;
std::vector<std::string> Name;
};
struct EquipmentInfo
@@ -662,8 +662,8 @@ union GameObjectValue
struct GameObjectLocale
{
StringVector Name;
StringVector CastBarCaption;
std::vector<std::string> Name;
std::vector<std::string> CastBarCaption;
};
// `gameobject_addon` table
+3 -3
View File
@@ -824,8 +824,8 @@ typedef std::unordered_map<uint32, ItemTemplate> ItemTemplateContainer;
struct ItemLocale
{
StringVector Name;
StringVector Description;
std::vector<std::string> Name;
std::vector<std::string> Description;
};
struct ItemSetNameEntry
@@ -836,7 +836,7 @@ struct ItemSetNameEntry
struct ItemSetNameLocale
{
StringVector Name;
std::vector<std::string> Name;
};
#endif
@@ -7,9 +7,9 @@
#ifndef _OBJECT_POS_SELECTOR_H
#define _OBJECT_POS_SELECTOR_H
#include<Common.h>
#include<map>
#include "Define.h"
#include <math.h>
#include <map>
enum UsedPosType { USED_POS_PLUS, USED_POS_MINUS };
@@ -27001,6 +27001,8 @@ void Player::_SaveCharacter(bool create, SQLTransaction& trans)
PreparedStatement* stmt = nullptr;
uint8 index = 0;
auto finiteAlways = [](float f) { return std::isfinite(f) ? f : 0.0f; };
if (create)
{
//! Insert query
-5
View File
@@ -3924,9 +3924,6 @@ void Unit::HandleSafeUnitPointersOnDelete(Unit* thisUnit)
for (std::set<SafeUnitPointer*>::iterator itr = thisUnit->SafeUnitPointerSet.begin(); itr != thisUnit->SafeUnitPointerSet.end(); ++itr)
(*itr)->UnitDeleted();
thisUnit->SafeUnitPointerSet.clear();
ACE_Stack_Trace trace(0, 50);
LOG_INFO("misc", "Unit::HandleSafeUnitPointersOnDelete CALL STACK (1):\n%s\n", trace.c_str());
}
bool Unit::IsInWater(bool allowAbove) const
@@ -17604,8 +17601,6 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au
if (!charmer->IsInWorld() || charmer->IsDuringRemoveFromWorld())
{
ACE_Stack_Trace trace(0, 50);
LOG_INFO("misc", "Unit::SetCharmedBy CALL STACK (1):\n%s\n", trace.c_str());
return false;
}