diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-09-18 04:18:31 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-09-18 04:18:31 +0300 |
commit | ea7ce2d1099761d4f10a1985cc1491dd306093fb (patch) | |
tree | 0ecc2ba76c949af2876ea3fe532d3796d4d0f666 /src/resources | |
parent | d5a295a5ef8338a6d292bb3c60bddcfb8baf17bc (diff) | |
download | manaverse-ea7ce2d1099761d4f10a1985cc1491dd306093fb.tar.gz manaverse-ea7ce2d1099761d4f10a1985cc1491dd306093fb.tar.bz2 manaverse-ea7ce2d1099761d4f10a1985cc1491dd306093fb.tar.xz manaverse-ea7ce2d1099761d4f10a1985cc1491dd306093fb.zip |
Replace SDL macro defines to SDL_GetError.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/imagehelper.cpp | 4 | ||||
-rw-r--r-- | src/resources/loaders/musicloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/loaders/soundloader.cpp | 2 | ||||
-rw-r--r-- | src/resources/openglimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/safeopenglimagehelper.cpp | 2 | ||||
-rw-r--r-- | src/resources/sdlimagehelper.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp index be6f96ab3..76747979b 100644 --- a/src/resources/imagehelper.cpp +++ b/src/resources/imagehelper.cpp @@ -51,7 +51,7 @@ Image *ImageHelper::load(SDL_RWops *const rw) SDL_Surface *const tmpImage = loadPng(rw); if (tmpImage == nullptr) { - logger->log("Error, image load failed: %s", IMG_GetError()); + logger->log("Error, image load failed: %s", SDL_GetError()); return nullptr; } @@ -67,7 +67,7 @@ Image *ImageHelper::load(SDL_RWops *const rw, Dye const &dye) SDL_Surface *const tmpImage = loadPng(rw); if (tmpImage == nullptr) { - logger->log("Error, image load failed: %s", IMG_GetError()); + logger->log("Error, image load failed: %s", SDL_GetError()); BLOCK_END("ImageHelper::load") return nullptr; } diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index e734ddce6..7ac151c12 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -67,7 +67,7 @@ namespace } #endif // USE_SDL2 - logger->log("Error, failed to load music: %s", Mix_GetError()); + logger->log("Error, failed to load music: %s", SDL_GetError()); return nullptr; } }; diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index b99b48b6c..879bc0cb1 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -61,7 +61,7 @@ namespace return new SoundEffect(tmpSoundEffect, rl->path); } reportAlways("Error, failed to load sound effect: %s", - Mix_GetError()); + SDL_GetError()); return nullptr; } }; diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 87972f5c3..6c30c6a73 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -74,7 +74,7 @@ Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye) SDL_Surface *const tmpImage = loadPng(rw); if (tmpImage == nullptr) { - reportAlways("Error, image load failed: %s", IMG_GetError()); + reportAlways("Error, image load failed: %s", SDL_GetError()); return nullptr; } diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp index 118dea49d..2fcff7eb0 100644 --- a/src/resources/safeopenglimagehelper.cpp +++ b/src/resources/safeopenglimagehelper.cpp @@ -71,7 +71,7 @@ Image *SafeOpenGLImageHelper::load(SDL_RWops *const rw, SDL_Surface *const tmpImage = loadPng(rw); if (tmpImage == nullptr) { - logger->log("Error, image load failed: %s", IMG_GetError()); + logger->log("Error, image load failed: %s", SDL_GetError()); return nullptr; } diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp index 21bc75b0b..fecd11482 100644 --- a/src/resources/sdlimagehelper.cpp +++ b/src/resources/sdlimagehelper.cpp @@ -62,7 +62,7 @@ Image *SDLImageHelper::load(SDL_RWops *const rw, Dye const &dye) if (tmpImage == nullptr) { reportAlways("Error, image load failed: %s", - IMG_GetError()); + SDL_GetError()); return nullptr; } |