aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Chat
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-08-09 21:32:26 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-08-09 21:32:26 +0100
commitdf3b08d14018f13063c68b8886422ec7b1cbcc63 (patch)
treea81c7f395318eac88ba3ec12458d82aee1b44378 /src/server/game/Chat
parenta394205eca86d2ea2a8539734df49432189bc73b (diff)
Core/Server: Use nullptr instead of 0 where pointers are expected
Diffstat (limited to 'src/server/game/Chat')
-rw-r--r--src/server/game/Chat/Chat.cpp4
-rw-r--r--src/server/game/Chat/ChatLink.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index d77ee5b7f61..50f67d4f920 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -966,7 +966,7 @@ static char const* const spellKeys[] =
"Henchant", // enchanting recipe spell
"Htrade", // profession/skill spell
"Hglyph", // glyph
- 0
+ nullptr
};
uint32 ChatHandler::extractSpellIdFromLink(char* text)
@@ -1050,7 +1050,7 @@ static char const* const guidKeys[] =
"Hplayer",
"Hcreature",
"Hgameobject",
- 0
+ nullptr
};
uint64 ChatHandler::extractGuidFromLink(char* text)
diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index 6abf9395d82..33fb3431a84 100644
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@@ -106,8 +106,8 @@ public:
{
memset(_data, 0, sizeof(_data));
}
- virtual bool Initialize(std::istringstream& iss);
- virtual bool ValidateName(char* buffer, const char* context);
+ virtual bool Initialize(std::istringstream& iss) override;
+ virtual bool ValidateName(char* buffer, const char* context) override;
protected:
uint32 _guid;
@@ -120,7 +120,7 @@ class TradeChatLink : public SpellChatLink
{
public:
TradeChatLink() : SpellChatLink(), _minSkillLevel(0), _maxSkillLevel(0), _guid(0) { }
- virtual bool Initialize(std::istringstream& iss);
+ virtual bool Initialize(std::istringstream& iss) override;
private:
int32 _minSkillLevel;
int32 _maxSkillLevel;