Merge branch '4jcraft:dev' into fix-with-ubsan

This commit is contained in:
Nikita Edel 2026-03-11 19:25:14 +01:00 committed by GitHub
commit b47ee34a61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View file

@ -79,7 +79,7 @@ void Minimap::reloadColours()
int b = ((color) & 0xff) * br / 255;
// 4J - changed byte order to save having to reorder later
#if ( defined _DURANGO || defined _WIN64 || __PSVITA__ )
#if ( defined _DURANGO || defined _WIN64 || __PSVITA__ || __linux__ )
LUT[i] = 255 << 24 | b << 16 | g << 8 | r;
#elif defined _XBOX
LUT[i] = 255 << 24 | r << 16 | g << 8 | b;

View file

@ -122,7 +122,7 @@ meson setup build --reconfigure
...or to hard reset the build directory:
```bash
rm -rf ./build
rm -r ./build
meson setup build
```