games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Revert "Merge branch 'p254_4' into develop"

Browse Source 
This reverts commit 37f68713a7, reversing
changes made to 4477b7c35d.
This commit is contained in:
AlexVinS
2016-11-08 00:15:46 +03:00
parent 37f68713a7
commit aad675a7c4
14 changed files with 875 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CBitmapHandler.cpp
View File

@@ -167,10 +167,6 @@ SDL_Surface * BitmapHandler::loadBitmapFromDir(std::string path, std::string fna
{
CSDL_Ext::setDefaultColorKeyPresize(ret);
}
else if (ret->format->Amask)
{
SDL_SetSurfaceBlendMode(ret, SDL_BLENDMODE_BLEND);
}
else // always set
{
CSDL_Ext::setDefaultColorKey(ret);