X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fimage.c;h=4cc613e70062f8031c7703b7fbde5218b664f3dd;hb=3f0fff81d235d4259a00b504e24a29f3171fb5bb;hp=b26a508a20365c8aed5ee283421b87fff24963e8;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git diff --git a/src/libgame/image.c b/src/libgame/image.c index b26a508a..4cc613e7 100644 --- 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) { - Error(ERR_WARN, "cannot load image file '%s': LoadImage() failed: %s", - filename, GetError()); + Warn("cannot load image file '%s': LoadImage() failed", filename); free(img_info); @@ -140,13 +139,6 @@ char *getTokenFromImageID(int graphic) 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; @@ -399,9 +391,11 @@ void ScaleImage(int pos, int zoom_factor) return; if (zoom_factor != 1) + { ScaleBitmap(img_info->bitmaps, zoom_factor); - img_info->scaled_up = TRUE; + img_info->scaled_up = TRUE; + } } void FreeAllImages(void)