Commented out debug statements again

[oweals/minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 442eaef5df9282ac460bffb9743f6e8738394dba..930987c02e7f676f1289626c4ad44bdb85dc5aef 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -28,6 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "jmutex.h"
 #include <ostream>
 #include "clientobject.h"
+#include "utility.h" // For IntervalLimiter
 
 struct MeshMakeData;
 
@@ -198,17 +199,21 @@ public:
        // locks envlock
        void addNode(v3s16 p, MapNode n);
        
-       void updateCamera(v3f pos, v3f dir);
+       void updateCamera(v3f pos, v3f dir, f32 fov);
+       
+       void renderPostFx();
        
        // Returns InvalidPositionException if not found
        MapNode getNode(v3s16 p);
        // Wrapper to Map
        NodeMetadata* getNodeMetadata(v3s16 p);
 
-       v3f getPlayerPosition();
+       LocalPlayer* getLocalPlayer();
 
        void setPlayerControl(PlayerControl &control);
-       
+
+       void selectPlayerItem(u16 item);
+
        // Returns true if the inventory of the local player has been
        // updated from the server. If it is true, it is set to false.
        bool getLocalInventoryUpdated();
@@ -265,6 +270,12 @@ public:
 
        void addChatMessage(const std::wstring &message)
        {
+               if (message[0] == L'/') {
+                       m_chat_queue.push_back(
+                               (std::wstring)L"issued command: "+message);
+                       return;
+               }
+
                //JMutexAutoLock envlock(m_env_mutex); //bulk comment-out
                LocalPlayer *player = m_env.getLocalPlayer();
                assert(player != NULL);
@@ -304,13 +315,15 @@ private:
        void sendPlayerPos();
        // This sends the player's current name etc to the server
        void sendPlayerInfo();
+       // Send the item number 'item' as player item to the server
+       void sendPlayerItem(u16 item);
        
        float m_packetcounter_timer;
-       float m_delete_unused_sectors_timer;
        float m_connection_reinit_timer;
        float m_avg_rtt_timer;
        float m_playerpos_send_timer;
        float m_ignore_damage_timer; // Used after server moves player
+       IntervalLimiter m_map_timer_and_unload_interval;
 
        MeshUpdateThread m_mesh_update_thread;
        
@@ -320,9 +333,6 @@ private:
 
        IrrlichtDevice *m_device;
 
-       v3f camera_position;
-       v3f camera_direction;
-       
        // Server serialization version
        u8 m_server_ser_ver;