aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-07-18 17:33:43 +0200
committerTreeston <treeston.mmoc@gmail.com>2018-07-18 17:33:43 +0200
commitf93cb448f1d8b8346dff13fffacfd3c9f85edde0 (patch)
tree1025a430e5727e0f859e7fb38beffa16338ab5af
parentf7466c28a5f2c2acd2669991cb3a666c997aafab (diff)
Scripts/Commands: Demangled typeinfo of f7466c2 for gcc/cmake
-rw-r--r--src/server/scripts/Commands/cs_gobject.cpp4
-rw-r--r--src/server/scripts/Commands/cs_npc.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp
index 5d5cec9fc3e..5b49ae30f92 100644
--- a/src/server/scripts/Commands/cs_gobject.cpp
+++ b/src/server/scripts/Commands/cs_gobject.cpp
@@ -39,6 +39,8 @@ EndScriptData */
#include "PoolMgr.h"
#include "RBAC.h"
#include "WorldSession.h"
+#include <boost/core/demangle.hpp>
+#include <typeinfo>
// definitions are over in cs_npc.cpp
bool HandleNpcSpawnGroup(ChatHandler* handler, char const* args);
@@ -698,7 +700,7 @@ public:
handler->PSendSysMessage(LANG_OBJECTINFO_AIINFO, gameObjectInfo->AIName.c_str(), sObjectMgr->GetScriptName(gameObjectInfo->ScriptId).c_str());
if (GameObjectAI const* ai = thisGO ? thisGO->AI() : nullptr)
- handler->PSendSysMessage(LANG_OBJECTINFO_AITYPE, typeid(*ai).name());
+ handler->PSendSysMessage(LANG_OBJECTINFO_AITYPE, boost::core::demangle(typeid(*ai).name()).c_str());
if (GameObjectDisplayInfoEntry const* modelInfo = sGameObjectDisplayInfoStore.LookupEntry(displayId))
handler->PSendSysMessage(LANG_GOINFO_MODEL, modelInfo->maxX, modelInfo->maxY, modelInfo->maxZ, modelInfo->minX, modelInfo->minY, modelInfo->minZ);
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 0bb08cb9c79..edfa6d15d89 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -42,6 +42,8 @@ EndScriptData */
#include "Transport.h"
#include "World.h"
#include "WorldSession.h"
+#include <boost/core/demangle.hpp>
+#include <typeinfo>
template<typename E, typename T = char const*>
struct EnumName
@@ -812,7 +814,7 @@ public:
handler->PSendSysMessage(LANG_NPCINFO_POSITION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ());
handler->PSendSysMessage(LANG_OBJECTINFO_AIINFO, target->GetAIName().c_str(), target->GetScriptName().c_str());
if (CreatureAI const* ai = target->AI())
- handler->PSendSysMessage(LANG_OBJECTINFO_AITYPE, typeid(*ai).name());
+ handler->PSendSysMessage(LANG_OBJECTINFO_AITYPE, boost::core::demangle(typeid(*ai).name()).c_str());
handler->PSendSysMessage(LANG_NPCINFO_FLAGS_EXTRA, cInfo->flags_extra);
for (uint8 i = 0; i < FLAGS_EXTRA_COUNT; ++i)
if (cInfo->flags_extra & flagsExtra[i].Value)