Move .bmp files to .png format.

Even adding in lodepng, this is already a reduction in total size, and only
more savings as new games are added.

Author: icculus

CMakeLists.txt

@@ -128,6 +128,11 @@ target_include_directories(dirksimple-theoraplay PRIVATE
 target_compile_definitions(dirksimple-theoraplay PRIVATE "-DTHEORAPLAY_NO_MALLOC_FALLBACK=1")
 target_compile_definitions(dirksimple-theoraplay PRIVATE "-DTHEORAPLAY_NO_FOPEN_FALLBACK=1")
 
+add_library(dirksimple-lodepng STATIC
+    thirdparty/lodepng/lodepng.c
+)
+set_target_properties(dirksimple-lodepng PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
 add_library(dirksimple-lua STATIC
     thirdparty/lua/src/lapi.c
     thirdparty/lua/src/ldebug.c
@@ -174,9 +179,10 @@ if(DIRKSIMPLE_SDL)
         ${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR}
         thirdparty/lua/src
         thirdparty/theoraplay
+        thirdparty/lodepng
     )
     target_link_libraries(dirksimple ${SDL2_LIBRARIES} ${SDL2_LIBRARY})
-    target_link_libraries(dirksimple dirksimple-theoraplay dirksimple-theora dirksimple-vorbis dirksimple-ogg dirksimple-lua)
+    target_link_libraries(dirksimple dirksimple-theoraplay dirksimple-theora dirksimple-vorbis dirksimple-ogg dirksimple-lodepng dirksimple-lua)
     if(USE_PTHREAD)
         target_link_libraries(dirksimple pthread)
     endif()
@@ -221,9 +227,10 @@ if(DIRKSIMPLE_LIBRETRO)
         thirdparty/libretro
         thirdparty/lua/src
         thirdparty/theoraplay
+        thirdparty/lodepng
     )
     set_target_properties(dirksimple_libretro PROPERTIES PREFIX "")
-    target_link_libraries(dirksimple_libretro dirksimple-theoraplay dirksimple-theora dirksimple-vorbis dirksimple-ogg dirksimple-lua)
+    target_link_libraries(dirksimple_libretro dirksimple-theoraplay dirksimple-theora dirksimple-vorbis dirksimple-ogg dirksimple-lodepng dirksimple-lua)
 
     if(USE_PTHREAD)
         target_link_libraries(dirksimple_libretro pthread)

data/games/cliff/cliffglyphs.bmp

@@ -9,6 +9,7 @@
 #include "dirksimple_platform.h"
 
 #include "theoraplay.h"
+#include "lodepng.h"
 #include "lua.h"
 #include "lauxlib.h"
 #include "lualib.h"
@@ -312,11 +313,32 @@ uint8_t *DirkSimple_loadbmp(const char *fname, int *_w, int *_h)
 {
     long flen = 0;
     uint8_t *fbuf = DirkSimple_loadmedia(fname, &flen);
-    uint8_t *pixels = loadbmp_from_memory(fname, fbuf, flen, _w, _h);
+    uint8_t *pixels = fbuf ? loadbmp_from_memory(fname, fbuf, flen, _w, _h) : NULL;
     DirkSimple_free(fbuf);
     return (uint8_t *) pixels;
 }
 
+uint8_t *DirkSimple_loadpng(const char *fname, int *_w, int *_h)
+{
+    unsigned char *pixels = NULL;
+    long flen = 0;
+    uint8_t *fbuf = DirkSimple_loadmedia(fname, &flen);
+    if (fbuf) {
+        unsigned uw = 0;
+        unsigned uh = 0;
+        if (lodepng_decode32(&pixels, &uw, &uh, (const unsigned char *) fbuf, (size_t) flen) == 0) {
+            *_w = (int) uw;
+            *_h = (int) uh;
+        } else {
+            lodepng_free(pixels);
+            pixels = NULL;
+            *_w = *_h = 0;
+        }
+        DirkSimple_free(fbuf);
+    }
+    return (uint8_t *) pixels;
+}
+
 
 // !!! FIXME: we should probably cache all sprites and waves we see in the
 // !!! FIXME: game's dir during DirkSimple_startup. There are only a handful
@@ -346,12 +368,18 @@ static DirkSimple_Sprite *get_cached_sprite(const char *name)
     }
 
     // not cached yet, load it from disk.
+    int w, h;
+    uint8_t *rgba;
+
     const size_t slen = strlen(GGameDir) + strlen(name) + 8;
     char *fname = (char *) DirkSimple_xmalloc(slen);
-    snprintf(fname, slen, "%s%s.bmp", GGameDir, name);
+    snprintf(fname, slen, "%s%s.png", GGameDir, name);
+    rgba = DirkSimple_loadpng(fname, &w, &h);
+    if (!rgba) {  // maybe it's a bitmap?
+        snprintf(fname, slen, "%s%s.bmp", GGameDir, name);
+        rgba = DirkSimple_loadbmp(fname, &w, &h);
+    }
 
-    int w, h;
-    uint8_t *rgba = DirkSimple_loadbmp(fname, &w, &h);
     if (rgba) {
         DirkSimple_log("Loaded sprite '%s': %dx%d, RGBA", fname, w, h);
     }