mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
Compilation fixes - allow SDL1.
Please do not define class-specific constants that are static at same time.
This commit is contained in:
@@ -1306,7 +1306,7 @@ void CFadeAnimation::draw(SDL_Surface * targetSurface, const SDL_Rect * sourceRe
|
||||
return;
|
||||
}
|
||||
|
||||
SDL_SetSurfaceAlphaMod(fadingSurface, fadingCounter * 255);
|
||||
SDL_BlitSurface(fadingSurface, sourceRect, targetSurface, destRect);
|
||||
SDL_SetSurfaceAlphaMod(fadingSurface, 255);
|
||||
CSDL_Ext::setAlpha(fadingSurface, fadingCounter * 255);
|
||||
SDL_BlitSurface(fadingSurface, const_cast<SDL_Rect *>(sourceRect), targetSurface, destRect); //FIXME
|
||||
CSDL_Ext::setAlpha(fadingSurface, 255);
|
||||
}
|
||||
|
||||
@@ -221,6 +221,8 @@ public:
|
||||
size_t size(size_t group=0) const;
|
||||
};
|
||||
|
||||
const float DEFAULT_DELTA = 0.05f;
|
||||
|
||||
class CFadeAnimation
|
||||
{
|
||||
public:
|
||||
@@ -229,7 +231,6 @@ public:
|
||||
NONE, IN, OUT
|
||||
};
|
||||
private:
|
||||
static constexpr float DEFAULT_DELTA = 0.05f;
|
||||
float delta;
|
||||
SDL_Surface * fadingSurface;
|
||||
bool fading;
|
||||
|
||||
@@ -86,23 +86,32 @@ namespace CSDL_Ext
|
||||
{
|
||||
STRONG_INLINE void colorSetAlpha(SDL_Color & color, Uint8 alpha)
|
||||
{
|
||||
#ifdef VCMI_SDL1
|
||||
#ifdef VCMI_SDL1
|
||||
color.unused = alpha;
|
||||
#else
|
||||
#else
|
||||
color.a = alpha;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
//todo: should this better be assignment operator?
|
||||
STRONG_INLINE void colorAssign(SDL_Color & dest, const SDL_Color & source)
|
||||
{
|
||||
dest.r = source.r;
|
||||
dest.r = source.r;
|
||||
dest.g = source.g;
|
||||
dest.b = source.b;
|
||||
#ifdef VCMI_SDL1
|
||||
dest.b = source.b;
|
||||
#ifdef VCMI_SDL1
|
||||
dest.unused = source.unused;
|
||||
#else
|
||||
#else
|
||||
dest.a = source.a;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
inline void setAlpha(SDL_Surface * bg, int value)
|
||||
{
|
||||
#ifdef VCMI_SDL1
|
||||
SDL_SetAlpha(bg, SDL_SRCALPHA, value);
|
||||
#else
|
||||
SDL_SetSurfaceAlphaMod(bg, value);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
struct Rect;
|
||||
|
||||
Reference in New Issue
Block a user