projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed indentation (no functional change) (more)
[rocksndiamonds.git]
/
src
/
libgame
/
image.c
diff --git
a/src/libgame/image.c
b/src/libgame/image.c
index 820b966cd9ae1036745082c9942d41aa3cad08a4..4cc613e70062f8031c7703b7fbde5218b664f3dd 100644
(file)
--- a/
src/libgame/image.c
+++ b/
src/libgame/image.c
@@
-43,8
+43,7
@@
static void *Load_Image(char *filename)
if ((img_info->bitmaps[IMG_BITMAP_STANDARD] = LoadImage(filename)) == NULL)
{
if ((img_info->bitmaps[IMG_BITMAP_STANDARD] = LoadImage(filename)) == NULL)
{
- Warn("cannot load image file '%s': LoadImage() failed: %s",
- filename, GetError());
+ Warn("cannot load image file '%s': LoadImage() failed", filename);
free(img_info);
free(img_info);
@@
-140,13
+139,6
@@
char *getTokenFromImageID(int graphic)
return (file_list != NULL ? file_list->token : NULL);
}
return (file_list != NULL ? file_list->token : NULL);
}
-char *getFilenameFromImageID(int graphic)
-{
- struct FileInfo *file_list = getImageListEntryFromImageID(graphic);
-
- return (file_list != NULL ? file_list->filename : NULL);
-}
-
int getImageIDFromToken(char *token)
{
struct FileInfo *file_list = image_info->file_list;
int getImageIDFromToken(char *token)
{
struct FileInfo *file_list = image_info->file_list;
@@
-399,9
+391,11
@@
void ScaleImage(int pos, int zoom_factor)
return;
if (zoom_factor != 1)
return;
if (zoom_factor != 1)
+ {
ScaleBitmap(img_info->bitmaps, zoom_factor);
ScaleBitmap(img_info->bitmaps, zoom_factor);
- img_info->scaled_up = TRUE;
+ img_info->scaled_up = TRUE;
+ }
}
void FreeAllImages(void)
}
void FreeAllImages(void)