games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Dirty hackfix for https://bugs.vcmi.eu/view.php?id=2780

Browse Source
This commit is contained in:
AlexVinS 2017-09-03 23:38:15 +03:00
parent d7f76fc433
commit df34a2cc96
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
client/gui/CAnimation.cpp
View File

@ -253,10 +253,26 @@ static CFileCache animationCache;
* DefFile, class used for def loading * * DefFile, class used for def loading *
*************************************************************************/ *************************************************************************/
bool operator== (const SDL_Color & lhs, const SDL_Color & rhs)
{
return (lhs.a == rhs.a) && (lhs.b == rhs.b) &&(lhs.g == rhs.g) &&(lhs.r == rhs.r);
}
CDefFile::CDefFile(std::string Name): CDefFile::CDefFile(std::string Name):
data(nullptr), data(nullptr),
palette(nullptr) palette(nullptr)
{ {
static SDL_Color H3_ORIG_PALETTE[8] =
{
{ 0, 255, 255, SDL_ALPHA_OPAQUE},
{255, 150, 255, SDL_ALPHA_OPAQUE},
{255, 100, 255, SDL_ALPHA_OPAQUE},
{255, 50, 255, SDL_ALPHA_OPAQUE},
{255, 0, 255, SDL_ALPHA_OPAQUE},
{255, 255, 0, SDL_ALPHA_OPAQUE},
{180, 0, 255, SDL_ALPHA_OPAQUE},
{ 0, 255, 0, SDL_ALPHA_OPAQUE}
};
//First 8 colors in def palette used for transparency //First 8 colors in def palette used for transparency
static SDL_Color H3Palette[8] = static SDL_Color H3Palette[8] =
{ {
@ -292,7 +308,17 @@ CDefFile::CDefFile(std::string Name):
if (type == 71 || type == 64)//Buttons/buildings don't have shadows\semi-transparency if (type == 71 || type == 64)//Buttons/buildings don't have shadows\semi-transparency
memset(palette.get(), 0, sizeof(SDL_Color)*2); memset(palette.get(), 0, sizeof(SDL_Color)*2);
else else
memcpy(palette.get(), H3Palette, sizeof(SDL_Color)*8);//initialize shadow\selection colors {
//TODO: more accurate conversion
memcpy(palette.get(), H3Palette, sizeof(SDL_Color)*2);
for(int i = 2; i < 8; i++)
{
if(palette[i] == H3_ORIG_PALETTE[i])
palette[i] = H3Palette[i];
}
}
for (ui32 i=0; i<totalBlocks; i++) for (ui32 i=0; i<totalBlocks; i++)
{ {