MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-25 22:09:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix load of 4bit CI textures when TLUT mode is off. Correction for commit 98960950

Browse Source 
Fixed color of the glove in Doubutsu no Mori sub-screen.
This commit is contained in:
Sergey Lipskiy 2019-03-23 12:37:38 +07:00
parent 751fe2b3fa
commit fc96b78542
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Textures.cpp
View File

@ -34,14 +34,14 @@ inline u32 GetCI4_RGBA8888(u64 *src, u16 x, u16 i, u8 palette)
{
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
return CI4_RGBA8888((x & 1) ? (color4B & 0x0F) : (color4B >> 4));
return CI4_RGBA8888((x & 1) ? (palette << 4) | (color4B & 0x0F) : (palette << 4) | (color4B >> 4));
}
inline u32 GetCI4_RGBA4444(u64 *src, u16 x, u16 i, u8 palette)
{
u8 color4B = ((u8*)src)[(x >> 1) ^ (i << 1)];
return CI4_RGBA4444((x & 1) ? (color4B & 0x0F) : (color4B >> 4));
return CI4_RGBA4444((x & 1) ? (palette << 4) | (color4B & 0x0F) : (palette << 4) | (color4B >> 4));
}
inline u32 GetCI4IA_RGBA4444(u64 *src, u16 x, u16 i, u8 palette)

5
src/convert.h
View File

@ -327,13 +327,10 @@ inline u16 I4_RGBA4444( u8 color )
inline u32 CI4_RGBA4444(u8 color)
{
#if 0
u16 ret = (color & 0x0f) >> 3;
u16 ret = color >> 4;
ret |= ret << 4;
ret |= ret << 8;
return ret;
#endif
return 0;
}
inline u32 CI4_RGBA8888(u8 color)