aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2014-09-18 02:36:28 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2014-09-18 02:36:28 +0200
commit72ed5bfc93af016722c115ef032f7cb1c43d9983 (patch)
treec283f8cd6fee7b8799cbb8ec9b9d8dd8926a17ad /src/server/game/Server
parent55ecd1c9132a7fd8c6ca51a0089b39aec606c0ff (diff)
Core/Misc: changed trinity string id to unsigned and removed obsolete code
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/WorldSession.cpp2
-rw-r--r--src/server/game/Server/WorldSession.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index beb6ea54b32..84bb90638f7 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -621,7 +621,7 @@ void WorldSession::SendNotification(uint32 string_id, ...)
}
}
-const char *WorldSession::GetTrinityString(int32 entry) const
+char const* WorldSession::GetTrinityString(uint32 entry) const
{
return sObjectMgr->GetTrinityString(entry, GetSessionDbLocaleIndex());
}
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index e46a58d5098..789bd5ab04f 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -366,7 +366,7 @@ class WorldSession
// Locales
LocaleConstant GetSessionDbcLocale() const { return m_sessionDbcLocale; }
LocaleConstant GetSessionDbLocaleIndex() const { return m_sessionDbLocaleIndex; }
- const char *GetTrinityString(int32 entry) const;
+ char const* GetTrinityString(uint32 entry) const;
uint32 GetLatency() const { return m_latency; }
void SetLatency(uint32 latency) { m_latency = latency; }