AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Suggestions

Browse Source
This commit is contained in:
Tiger Wang 2014-06-04 18:59:56 +01:00
parent 3278a403b5
commit 74cd4f5521
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Player.cpp
View File

@ -1659,7 +1659,7 @@ void cPlayer::LoadPermissionsFromDisk()
bool cPlayer::LoadFromDisk(cWorld * a_World) bool cPlayer::LoadFromDisk(cWorld *& a_World)
{ {
a_World = cRoot::Get()->GetWorld(GetLoadedWorldName()); a_World = cRoot::Get()->GetWorld(GetLoadedWorldName());
if (a_World == NULL) if (a_World == NULL)

12
src/Entities/Player.h
View File

@ -127,7 +127,7 @@ public:
inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); } // tolua_export
/** Returns whether the player is climbing (ladders, vines e.t.c). */ /** Returns whether the player is climbing (ladders, vines etc.) */
bool IsClimbing(void) const; bool IsClimbing(void) const;
virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override; virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override;
@ -330,8 +330,13 @@ public:
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) override; // tolua_export
/** Saves all player data, such as inventory, to JSON */
bool SaveToDisk(void); bool SaveToDisk(void);
bool LoadFromDisk(cWorld * a_World);
/** Loads player data from JSON to the object
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; } const AString & GetLoadedWorldName() { return m_LoadedWorldName; }
@ -342,8 +347,7 @@ public:
void SendExperience(void); void SendExperience(void);
// In UI windows, the item that the player is dragging: /** In UI windows, the item that the player is dragging */
bool IsDraggingItem(void) const { return !m_DraggingItem.IsEmpty(); }
cItem & GetDraggingItem(void) {return m_DraggingItem; } cItem & GetDraggingItem(void) {return m_DraggingItem; }
// In UI windows, when inventory-painting: // In UI windows, when inventory-painting:

2
src/UI/Window.cpp
View File

@ -283,7 +283,7 @@ void cWindow::OpenedByPlayer(cPlayer & a_Player)
bool cWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse) bool cWindow::ClosedByPlayer(cPlayer & a_Player, bool a_CanRefuse)
{ {
// Checks whether the player is still holding an item // Checks whether the player is still holding an item
if (a_Player.IsDraggingItem()) if (!a_Player.GetDraggingItem().IsEmpty())
{ {
LOGD("Player holds item! Dropping it..."); LOGD("Player holds item! Dropping it...");
a_Player.TossHeldItem(a_Player.GetDraggingItem().m_ItemCount); a_Player.TossHeldItem(a_Player.GetDraggingItem().m_ItemCount);