summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-20 11:46:45 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-20 11:46:45 +0200
commit6ab9afd0fd808fad99cd8387c72ce461c37aef80 (patch)
treec7fdd4f7cdc75b4958c297e55e2801510654ee76 /src/Entities/Player.h
parentFix failed merge and other issues (diff)
downloadcuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.gz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.bz2
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.lz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.xz
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.tar.zst
cuberite-6ab9afd0fd808fad99cd8387c72ce461c37aef80.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index ad434f036..226ec5e68 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -340,14 +340,17 @@ 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
- Returns true on success, false on failure. */
+ /** 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()
+ Returns true on success, false on failure
+ */
bool LoadFromDisk(cWorldPtr & a_World);
- /** Loads the player data from the specified file.
- Returns true on success, false on failure. */
- bool LoadFromFile(const AString & a_FileName, cWorld * 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
+ Returns true on success, false on failure
+ */
+ bool LoadFromFile(const AString & a_FileName, cWorldPtr & a_World);
void LoadPermissionsFromDisk(void); // tolua_export