diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-14 00:19:48 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:41 +0200 |
| commit | abceeee92f99b84ebb79968269835a4f509bfb90 (patch) | |
| tree | 669edeca68fae4eb086ac4e4c1846b55d3aa779d /src/player.cpp | |
| parent | 5fc791ac9a15ea6f234ca2d23041c83679255746 (diff) | |
| download | minetest-abceeee92f99b84ebb79968269835a4f509bfb90.tar.gz minetest-abceeee92f99b84ebb79968269835a4f509bfb90.tar.bz2 minetest-abceeee92f99b84ebb79968269835a4f509bfb90.zip | |
Create framework for getting rid of global definitions of node/tool/item/whatever types
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/player.cpp b/src/player.cpp index c8a3816e6..a1edb8299 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef SERVER #include <ITextSceneNode.h> #endif +#include "main.h" // For g_settings #include "settings.h" #include "mapnode_contentfeatures.h" @@ -128,7 +129,7 @@ void Player::serialize(std::ostream &os) inventory.serialize(os); } -void Player::deSerialize(std::istream &is) +void Player::deSerialize(std::istream &is, IGameDef *gamedef) { Settings args; @@ -162,7 +163,7 @@ void Player::deSerialize(std::istream &is) hp = 20; } - inventory.deSerialize(is); + inventory.deSerialize(is, gamedef); } /* |