added simple skybox

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 2eaeaae9a6cfdf6e9ce7f03371d2467676e931c7..f70b52fe737453a6741a8ca339de8f2f8148da27 100644 (file)
--- 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
 
@@ -124,6 +121,8 @@ class Player
 
        bool craftresult_is_preview;
 
+       u16 hp;
+
        u16 peer_id;
 
 protected:
@@ -325,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);