CollisionMoveSimple: Collide with 'ignore' nodes

[minetest.git] / src / light.h

diff --git a/src/light.h b/src/light.h
index f49be4518188cc78971c02ccb860dd862a285f99..f8c4b83c33dd221363a0aa8ea92f20f0fdf7c3a7 100644 (file)
--- a/src/light.h
+++ b/src/light.h
@@ -17,9 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef LIGHT_HEADER
-#define LIGHT_HEADER
-
+#pragma once
+#include <cassert>
 #include "irrlichttypes.h"
 
 /*
@@ -27,8 +26,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 // This directly sets the range of light.
-// Actually this is not the real maximum, and this is not the
-// brightest. The brightest is LIGHT_SUN.
+// Actually this is not the real maximum, and this is not the brightest, the
+// brightest is LIGHT_SUN.
+// If changed, this constant as defined in builtin/game/constants.lua must
+// also be changed.
 #define LIGHT_MAX 14
 // Light is stored as 4 bits, thus 15 is the maximum.
 // This brightness is reserved for sunlight
@@ -36,30 +37,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 inline u8 diminish_light(u8 light)
 {
-       if(light == 0)
+       if (light == 0)
                return 0;
-       if(light >= LIGHT_MAX)
+       if (light >= LIGHT_MAX)
                return LIGHT_MAX - 1;
-               
+
        return light - 1;
 }
 
 inline u8 diminish_light(u8 light, u8 distance)
 {
-       if(distance >= light)
+       if (distance >= light)
                return 0;
-       return  light - distance;
+       return light - distance;
 }
 
 inline u8 undiminish_light(u8 light)
 {
+       assert(light <= LIGHT_SUN);
        // We don't know if light should undiminish from this particular 0.
        // Thus, keep it at 0.
-       if(light == 0)
+       if (light == 0)
                return 0;
-       if(light == LIGHT_MAX)
+       if (light >= LIGHT_MAX)
                return light;
-       
+
        return light + 1;
 }
 
@@ -83,9 +85,9 @@ extern const u8 *light_decode_table;
 // 0 <= return value <= 255
 inline u8 decode_light(u8 light)
 {
-       if(light > LIGHT_MAX)
-               light = LIGHT_MAX;
-       
+       // assert(light <= LIGHT_SUN);
+       if (light > LIGHT_SUN)
+               light = LIGHT_SUN;
        return light_decode_table[light];
 }
 
@@ -95,12 +97,12 @@ inline float decode_light_f(float light_f)
 {
        s32 i = (u32)(light_f * LIGHT_MAX + 0.5);
 
-       if(i <= 0)
+       if (i <= 0)
                return (float)light_decode_table[0] / 255.0;
-       if(i >= LIGHT_MAX)
-               return (float)light_decode_table[LIGHT_MAX] / 255.0;
+       if (i >= LIGHT_SUN)
+               return (float)light_decode_table[LIGHT_SUN] / 255.0;
 
-       float v1 = (float)light_decode_table[i-1] / 255.0;
+       float v1 = (float)light_decode_table[i - 1] / 255.0;
        float v2 = (float)light_decode_table[i] / 255.0;
        float f0 = (float)i - 0.5;
        float f = light_f * LIGHT_MAX - f0;
@@ -117,11 +119,8 @@ void set_light_table(float gamma);
 inline u8 blend_light(u32 daylight_factor, u8 lightday, u8 lightnight)
 {
        u32 c = 1000;
-       u32 l = ((daylight_factor * lightday + (c-daylight_factor) * lightnight))/c;
-       if(l > LIGHT_SUN)
+       u32 l = ((daylight_factor * lightday + (c - daylight_factor) * lightnight)) / c;
+       if (l > LIGHT_SUN)
                l = LIGHT_SUN;
        return l;
 }
-
-#endif
-