fixed drawing text from file that contains DOS style CR/LF line endings

[rocksndiamonds.git] / src / libgame / image.c

diff --git a/src/libgame/image.c b/src/libgame/image.c
index 6bd09aa3bf1adedb7ed6ba67b4f8e8162d439da8..e182a495fd7c524b4719761c3457ecdc4093fac2 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // 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;