summaryrefslogtreecommitdiffstats
path: root/src/MapManager.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/MapManager.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 'src/MapManager.h')
-rw-r--r--src/MapManager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MapManager.h b/src/MapManager.h
index a40ec2630..2cc6a7bce 100644
--- a/src/MapManager.h
+++ b/src/MapManager.h
@@ -31,12 +31,12 @@ public:
cMapManager(cWorld * a_World);
- /** Returns the map with the specified ID, NULL if out of range.
+ /** Returns the map with the specified ID, nullptr if out of range.
WARNING: The returned map object is not thread safe.
*/
cMap * GetMapData(unsigned int a_ID);
- /** Creates a new map. Returns NULL on error */
+ /** Creates a new map. Returns nullptr on error */
cMap * CreateMap(int a_CenterX, int a_CenterY, int a_Scale = 3);
/** Calls the callback for the map with the specified ID.