summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-23 22:12:59 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-23 22:12:59 +0200
commit1156914dd60b4949116e57ec1480f81c39b6f292 (patch)
treeaf5e5db060f819ba4f92e84aa2c6b096e334a704 /src/Entities/Player.h
parentSpeed improvements, crash fixes, & self-suggestions (diff)
downloadcuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.gz
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.bz2
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.lz
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.xz
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.tar.zst
cuberite-1156914dd60b4949116e57ec1480f81c39b6f292.zip
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r--src/Entities/Player.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index d1b3a0339..c28802eec 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -333,7 +333,7 @@ public:
/** Moves the player to the specified world.
Returns true if successful, false on failure (world not found). */
- virtual bool MoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn = true) override; // tolua_export
+ virtual bool DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn) override;
/** Saves all player data, such as inventory, to JSON */
bool SaveToDisk(void);
@@ -341,13 +341,13 @@ public:
typedef cWorld * cWorldPtr;
/** Loads the player data from the disk file
- Takes a (NULL) cWorld pointer which it will assign a value to based on either the loaded world or default world by calling LoadFromFile()
+ Sets a_World to the world where the player will spawn, based on the stored world name or the default world by calling LoadFromFile()
Returns true on success, false on failure
*/
bool LoadFromDisk(cWorldPtr & a_World);
/** Loads the player data from the specified file
- Takes a (NULL) cWorld pointer which it will assign a value to based on either the loaded world or default world
+ Sets a_World to the world where the player will spawn, based on the stored world name or the default world
Returns true on success, false on failure
*/
bool LoadFromFile(const AString & a_FileName, cWorldPtr & a_World);