summaryrefslogtreecommitdiffstats
path: root/src/Scoreboard.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
commit987f79afdd8945966d0dfa2d52539e005f771590 (patch)
treefa55849604121317e0a565465212032ebe4b79cb /src/Scoreboard.h
parentUse std::recusive_mutex (diff)
downloadcuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.gz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.bz2
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.lz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.xz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.zst
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.zip
Diffstat (limited to '')
-rw-r--r--src/Scoreboard.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Scoreboard.h b/src/Scoreboard.h
index f53b8c803..dd4073c89 100644
--- a/src/Scoreboard.h
+++ b/src/Scoreboard.h
@@ -226,22 +226,22 @@ public:
// tolua_begin
- /** Registers a new scoreboard objective, returns the cObjective instance, NULL on name collision */
+ /** Registers a new scoreboard objective, returns the cObjective instance, nullptr on name collision */
cObjective * RegisterObjective(const AString & a_Name, const AString & a_DisplayName, cObjective::eType a_Type);
/** Removes a registered objective, returns true if operation was successful */
bool RemoveObjective(const AString & a_Name);
- /** Retrieves the objective with the specified name, NULL if not found */
+ /** Retrieves the objective with the specified name, nullptr if not found */
cObjective * GetObjective(const AString & a_Name);
- /** Registers a new team, returns the cTeam instance, NULL on name collision */
+ /** Registers a new team, returns the cTeam instance, nullptr on name collision */
cTeam * RegisterTeam(const AString & a_Name, const AString & a_DisplayName, const AString & a_Prefix, const AString & a_Suffix);
/** Removes a registered team, returns true if operation was successful */
bool RemoveTeam(const AString & a_Name);
- /** Retrieves the team with the specified name, NULL if not found */
+ /** Retrieves the team with the specified name, nullptr if not found */
cTeam * GetTeam(const AString & a_Name);
void SetDisplay(const AString & a_Objective, eDisplaySlot a_Slot);