From 8e1eacf3a87a0cee39c8c27c3846828c12e73f9d Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 30 Jul 2011 23:33:57 +0300
Subject: Fixed handling of inventory in creative mode (normal inventory is not
 trashed anymore), fixed mese pick speed, added some forgotten stuff

---
 src/player.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/player.cpp')

diff --git a/src/player.cpp b/src/player.cpp
index d52d6b88f..c43276ef1 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -29,6 +29,7 @@ Player::Player():
 	in_water(false),
 	in_water_stable(false),
 	swimming_up(false),
+	inventory_backup(NULL),
 	craftresult_is_preview(true),
 	hp(20),
 	peer_id(PEER_ID_INEXISTENT),
@@ -43,6 +44,7 @@ Player::Player():
 
 Player::~Player()
 {
+	delete inventory_backup;
 }
 
 void Player::resetInventory()
@@ -106,8 +108,13 @@ void Player::serialize(std::ostream &os)
 	args.writeLines(os);
 
 	os<<"PlayerArgsEnd\n";
-
-	inventory.serialize(os);
+	
+	// If actual inventory is backed up due to creative mode, save it
+	// instead of the dummy creative mode inventory
+	if(inventory_backup)
+		inventory_backup->serialize(os);
+	else
+		inventory.serialize(os);
 }
 
 void Player::deSerialize(std::istream &is)
-- 
cgit v1.2.3