projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba96307
)
changed error handling and messages when loading images
author
Holger Schemel
<info@artsoft.org>
Wed, 29 Jun 2016 19:30:02 +0000
(21:30 +0200)
committer
Holger Schemel
<info@artsoft.org>
Wed, 29 Jun 2016 19:30:02 +0000
(21:30 +0200)
src/libgame/sdl.c
patch
|
blob
|
history
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index eaab2530d000ae1e2d7d287ad805f9ea3a1592d9..1b8d139e5031369122ac84f9afcb450ab934adfe 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-2188,7
+2188,7
@@
static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface)
return NULL;
if ((new_surface = SDLGetNativeSurface(surface)) == NULL)
return NULL;
if ((new_surface = SDLGetNativeSurface(surface)) == NULL)
- Error(ERR_EXIT, "SDL
_DisplayFormat
() failed");
+ Error(ERR_EXIT, "SDL
GetNativeSurface
() failed");
/* remove alpha channel from native non-transparent surface, if defined */
SDLSetAlpha(new_surface, FALSE, 0);
/* remove alpha channel from native non-transparent surface, if defined */
SDLSetAlpha(new_surface, FALSE, 0);
@@
-2247,11
+2247,7
@@
Bitmap *SDLLoadImage(char *filename)
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
- {
- SetError("IMG_Load(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
print_timestamp_time("IMG_Load");
print_timestamp_time("IMG_Load");
@@
-2259,11
+2255,7
@@
Bitmap *SDLLoadImage(char *filename)
/* create native non-transparent surface for current image */
if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
/* create native non-transparent surface for current image */
if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
/* remove alpha channel from native non-transparent surface, if defined */
SDLSetAlpha(new_bitmap->surface, FALSE, 0);
/* remove alpha channel from native non-transparent surface, if defined */
SDLSetAlpha(new_bitmap->surface, FALSE, 0);
@@
-2271,7
+2263,7
@@
Bitmap *SDLLoadImage(char *filename)
/* remove transparent color from native non-transparent surface, if defined */
SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
/* remove transparent color from native non-transparent surface, if defined */
SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
- print_timestamp_time("SDL
_DisplayFormat
(opaque)");
+ print_timestamp_time("SDL
GetNativeSurface
(opaque)");
UPDATE_BUSY_STATE();
UPDATE_BUSY_STATE();
@@
-2283,13
+2275,9
@@
Bitmap *SDLLoadImage(char *filename)
/* create native transparent surface for current image */
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
/* create native transparent surface for current image */
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
- print_timestamp_time("SDL
_DisplayFormat
(masked)");
+ print_timestamp_time("SDL
GetNativeSurface
(masked)");
UPDATE_BUSY_STATE();
UPDATE_BUSY_STATE();