Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / content_cao.h

diff --git a/src/client/content_cao.h b/src/client/content_cao.h
index 7e9bb6671e1262254724db27a53fbceb389d2f27..8e5d04bfac2e572857ee0710e0d08a9d43aef44b 100644 (file)
--- a/src/client/content_cao.h
+++ b/src/client/content_cao.h
@@ -125,7 +125,7 @@ class GenericCAO : public ClientActiveObject
        std::string m_current_texture_modifier = "";
        bool m_visuals_expired = false;
        float m_step_distance_counter = 0.0f;
-       u8 m_last_light = 255;
+       video::SColor m_last_light = video::SColor(0xFFFFFFFF);
        bool m_is_visible = false;
        s8 m_glow = 0;
        // Material
@@ -182,12 +182,12 @@ class GenericCAO : public ClientActiveObject
                return m_velocity;
        }
 
-       inline const u16 getHp() const
+       inline u16 getHp() const
        {
                return m_hp;
        }
 
-       const bool isImmortal();
+       bool isImmortal() const;
 
        inline const ObjectProperties &getProperties() const { return m_prop; }
 
@@ -271,7 +271,7 @@ class GenericCAO : public ClientActiveObject
 
        void updateLight(u32 day_night_ratio);
 
-       void setNodeLight(u8 light);
+       void setNodeLight(const video::SColor &light);
 
        /* Get light position(s).
         * returns number of positions written into pos[], which must have space