Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix light overflow of u8 if light is saturated at 255 (#10305)

master
BenjaminRi 2020-08-23 15:39:55 +02:00 committed by GitHub
parent cf5547227d
commit f5a203fbcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/light.cpp
View File

@ -18,6 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "light.h"
#include <algorithm>
#include <cmath>
#include "util/numeric.h"
#include "settings.h"
@ -81,9 +82,11 @@ void set_light_table(float gamma)
// Strictly speaking, rangelim is not necessary here—if the implementation
// is conforming. But we don’t want problems in any case.
light_LUT[i] = rangelim((s32)(255.0f * brightness), 0, 255);
// Ensure light brightens with each level
if (i > 1 && light_LUT[i] <= light_LUT[i - 1])
light_LUT[i] = light_LUT[i - 1] + 1;
if (i > 0 && light_LUT[i] <= light_LUT[i - 1]) {
light_LUT[i] = std::min((u8)254, light_LUT[i - 1]) + 1;
}
}
}