Minor fixes for file/modlist download in mainmenu

[minetest.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index c9d010d7c653ff3343e3a3b9993d3eb72e20d544..b6a3ed1f6c8b951a5020da2a809c228b435ed8bd 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 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 Lesser General Public License as published by
@@ -21,6 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LOCALPLAYER_HEADER
 
 #include "player.h"
+#include <list>
+
+class ClientEnvironment;
+
+class ClientActiveObject;
 
 class LocalPlayer : public Player
 {
@@ -32,14 +37,16 @@ class LocalPlayer : public Player
        {
                return true;
        }
+       
+       ClientActiveObject *parent;
 
        bool isAttached;
 
        v3f overridePosition;
        
-       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 move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
+                       std::list<CollisionInfo> *collision_info);
+       void move(f32 dtime, ClientEnvironment *env, f32 pos_max_d);
 
        void applyControl(float dtime);
 
@@ -52,6 +59,11 @@ class LocalPlayer : public Player
        float last_yaw;
        unsigned int last_keyPressed;
 
+       float camera_impact;
+
+       std::string hotbar_image;
+       std::string hotbar_selected_image;
+
 private:
        // This is used for determining the sneaking range
        v3s16 m_sneak_node;