Catch SendFailedException when replying back in Connection::Receive()

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

diff --git a/src/player.h b/src/player.h
index 350b85e1ba5ba46a547729b417713a219d05200f..a352c1bd94790bfe8d38cf388f119443990ca69c 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -126,7 +126,10 @@ public:
 
        virtual bool isLocal() const = 0;
 
-       virtual void updateLight(u8 light_at_pos) {};
+       virtual void updateLight(u8 light_at_pos)
+       {
+               light = light_at_pos;
+       }
        
        // NOTE: Use peer_id == 0 for disconnected
        /*virtual bool isClientConnected() { return false; }
@@ -147,8 +150,9 @@ public:
        bool in_water_stable;
        bool is_climbing;
        bool swimming_up;
-       bool is_frozen;
        
+       u8 light;
+
        Inventory inventory;
        // Actual inventory is backed up here when creative mode is used
        Inventory *inventory_backup;
@@ -266,25 +270,14 @@ public:
 
        virtual void updateLight(u8 light_at_pos)
        {
+               Player::updateLight(light_at_pos);
+
                if(m_node == NULL)
                        return;
 
                u8 li = decode_light(light_at_pos);
                video::SColor color(255,li,li,li);
-
-               scene::IMesh *mesh = m_node->getMesh();
-               
-               u16 mc = mesh->getMeshBufferCount();
-               for(u16 j=0; j<mc; j++)
-               {
-                       scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-                       video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-                       u16 vc = buf->getVertexCount();
-                       for(u16 i=0; i<vc; i++)
-                       {
-                               vertices[i].Color = color;
-                       }
-               }
+               setMeshVerticesColor(m_node->getMesh(), color);
        }
        
        void move(f32 dtime, Map &map, f32 pos_max_d);