summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-03-30 08:32:43 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-03-30 08:32:43 +0200
commitb0273c6438652956b0c0188083a7422b7c328d65 (patch)
treedf536e502f68bcee9b31ed8fe760143e26075efe /src/Entities/Player.h
parentMerge pull request #3096 from mathias-github/icons (diff)
parentBed's world is now saved (diff)
downloadcuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar.gz
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar.bz2
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar.lz
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar.xz
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.tar.zst
cuberite-b0273c6438652956b0c0188083a7422b7c328d65.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 6d092eeb3..fae0e6177 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -459,8 +459,12 @@ public:
*/
Vector3i GetLastBedPos(void) const { return m_LastBedPos; }
- /** Sets the player's bed (home) position */
- void SetBedPos(const Vector3i & a_Pos) { m_LastBedPos = a_Pos; }
+ /** Sets the player's bed (home / respawn) position to the specified position.
+ Sets the respawn world to the player's world. */
+ void SetBedPos(const Vector3i & a_Pos);
+
+ /** Sets the player's bed (home / respawn) position and respawn world to the specified parameters. */
+ void SetBedPos(const Vector3i & a_Pos, cWorld * a_World);
// tolua_end
@@ -584,6 +588,9 @@ protected:
/** The player's last saved bed position */
Vector3i m_LastBedPos;
+ /** The world which the player respawns in upon death */
+ cWorld * m_SpawnWorld;
+
eGameMode m_GameMode;
AString m_IP;