diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-28 20:18:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-28 20:26:01 +0300 |
| commit | fdfd38278cba5fa37d203d0d29b4981e400a529a (patch) | |
| tree | fbad0c8bcdb2f6c9885d30e9d816761b6e89a0e7 /src/resources/imagehelper.h | |
| parent | dda65b8fb01ac399af8fa44085db3cd9ab6cef2b (diff) | |
| download | manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.gz manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.bz2 manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.xz manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.zip | |
Fix overload virtual warning with SDL2.
Diffstat (limited to 'src/resources/imagehelper.h')
| -rw-r--r-- | src/resources/imagehelper.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index 897e01458..f869c0f93 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -59,16 +59,17 @@ class ImageHelper notfinal virtual Image *load(SDL_RWops *const rw, Dye const &dye) A_WARN_UNUSED; #ifdef __GNUC__ - virtual Image *load(SDL_Surface *const) A_WARN_UNUSED = 0; + virtual Image *loadSurface(SDL_Surface *const) A_WARN_UNUSED = 0; virtual Image *createTextSurface(SDL_Surface *const tmpImage, const int width, const int height, float alpha) A_WARN_UNUSED = 0; #else - virtual Image *load(SDL_Surface *) A_WARN_UNUSED + virtual Image *loadSurface(SDL_Surface *const) A_WARN_UNUSED { return nullptr; } virtual Image *createTextSurface(SDL_Surface *const tmpImage, + const int width, const int height, const float alpha) const A_WARN_UNUSED { return nullptr; } #endif |