diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-30 23:33:57 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-30 23:33:57 +0300 |
| commit | 8e1eacf3a87a0cee39c8c27c3846828c12e73f9d (patch) | |
| tree | 0863d9782fa44d73ae25867aba1edacae6f15252 /src/player.cpp | |
| parent | 4ccc99b291d7aa9ccb3e3c56f9d63bf30e02b0b9 (diff) | |
| download | minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.tar.gz minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.tar.bz2 minetest-8e1eacf3a87a0cee39c8c27c3846828c12e73f9d.zip | |
Fixed handling of inventory in creative mode (normal inventory is not trashed anymore), fixed mese pick speed, added some forgotten stuff
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
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) |