From abceeee92f99b84ebb79968269835a4f509bfb90 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 14 Nov 2011 00:19:48 +0200
Subject: Create framework for getting rid of global definitions of
 node/tool/item/whatever types

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

(limited to 'src/player.cpp')

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);
 }
 
 /*
-- 
cgit v1.2.3