diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-12 16:21:07 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-12 16:21:07 +0200 |
commit | 29567c56107c86b70da130f995564beb2eaf424c (patch) | |
tree | be7b996042b28d8ebac0c7c665963d1d7e991600 /src/Entities/Player.h | |
parent | Merge branch 'master' into portals (diff) | |
download | cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.gz cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.bz2 cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.lz cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.xz cuberite-29567c56107c86b70da130f995564beb2eaf424c.tar.zst cuberite-29567c56107c86b70da130f995564beb2eaf424c.zip |
Diffstat (limited to 'src/Entities/Player.h')
-rw-r--r-- | src/Entities/Player.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 99a0e601c..8f319f1ae 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -323,14 +323,14 @@ public: virtual void Killed(cEntity * a_Victim) override; - void Respawn(void); // tolua_export + void Respawn(void); // tolua_export - void SetVisible( bool a_bVisible ); // tolua_export - bool IsVisible(void) const { return m_bVisible; } // tolua_export + void SetVisible(bool a_bVisible); // tolua_export + bool IsVisible(void) const { return m_bVisible; } // tolua_export /** Moves the player to the specified world. Returns true if successful, false on failure (world not found). */ - virtual bool MoveToWorld(const AString & a_WorldName, cWorld * a_World = NULL) override; // tolua_export + virtual bool MoveToWorld(const AString & a_WorldName, cWorld * a_World = NULL, bool a_ShouldSendRespawn = true) override; // tolua_export /** Saves all player data, such as inventory, to JSON */ bool SaveToDisk(void); @@ -339,7 +339,7 @@ public: Takes a (NULL) cWorld pointer which it will assign a value to based on either the loaded world or default world */ bool LoadFromDisk(cWorld *& a_World); - void LoadPermissionsFromDisk(void); // tolua_export + void LoadPermissionsFromDisk(void); // tolua_export const AString & GetLoadedWorldName() { return m_LoadedWorldName; } |