summaryrefslogtreecommitdiffstats
path: root/src/Scoreboard.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
committerHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
commit72bb299a4a4f74840c3b368c6669ddc3d32006ee (patch)
tree748fee756010b1f36aa95162f762e21ee0d19c0a /src/Scoreboard.h
parentMerge branch 'master' into ChunkLoader (diff)
parentFixed a crash in redstone simulator. (diff)
downloadcuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.gz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.bz2
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.lz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.xz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.zst
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.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);