X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=f70b52fe737453a6741a8ca339de8f2f8148da27;hb=0847e550f0b5484471e7c02d54ed35443824a86e;hp=710a9e0ed7c61bffc17385e4e1b869bcce3b45e7;hpb=c57637b4c39319e0c0d5d80d0ae2884aec66d691;p=dragonfireclient.git

diff --git a/src/player.h b/src/player.h
index 710a9e0ed..f70b52fe7 100644
--- a/src/player.h
+++ b/src/player.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,15 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef PLAYER_HEADER
 #define PLAYER_HEADER
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "collision.h"
 
 #define PLAYERNAME_SIZE 20
 
@@ -122,6 +119,10 @@ class Player
 	
 	Inventory inventory;
 
+	bool craftresult_is_preview;
+
+	u16 hp;
+
 	u16 peer_id;
 
 protected:
@@ -323,6 +324,8 @@ class LocalPlayer : public Player
 		return true;
 	}
 
+	void move(f32 dtime, Map &map, f32 pos_max_d,
+			core::list<CollisionInfo> *collision_info);
 	void move(f32 dtime, Map &map, f32 pos_max_d);
 
 	void applyControl(float dtime);