aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2014-06-12 17:51:57 +0200
committerShauren <shauren.trinity@gmail.com>2014-06-12 17:51:57 +0200
commit3b940a27664555dada92f0f01927c7da8f1d51aa (patch)
treed83817176a7dfc3b07b8805fc3602f5019bcb265 /src/server/game
parent0a6e81989ab1ba2fd6be16268475a7a26567658b (diff)
Core/Misc: Warning fixes
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Globals/ObjectMgr.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index b5ec850e35a..2e2f771daef 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -20900,7 +20900,7 @@ void Player::TextEmote(const std::string& text)
void Player::WhisperAddon(const std::string& text, const std::string& prefix, Player* receiver)
{
std::string _text(text);
- sScriptMgr->OnPlayerChat(this, CHAT_MSG_WHISPER, LANG_ADDON, _text, receiver);
+ sScriptMgr->OnPlayerChat(this, CHAT_MSG_WHISPER, uint32(LANG_ADDON), _text, receiver);
if (!receiver->GetSession()->IsAddonRegistered(prefix))
return;
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 9008e7415da..a5894ed1805 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1308,8 +1308,8 @@ class ObjectMgr
time_t ret = 0;
for (HotfixData::const_iterator itr = _hotfixData.begin(); itr != _hotfixData.end(); ++itr)
if (itr->Entry == entry && itr->Type == type)
- if (itr->Timestamp > ret)
- ret = itr->Timestamp;
+ if (time_t(itr->Timestamp) > ret)
+ ret = time_t(itr->Timestamp);
return ret ? ret : time(NULL);
}