Mercurial > hg > dmlib
diff tools/lib64gfx.h @ 1376:67ae449cf9e1
More work on making various FLI etc. format decoding more flexible.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 24 Sep 2017 17:47:48 +0300 |
| parents | f5368c13a872 |
| children | c465860e44ed |
line wrap: on
line diff
--- a/tools/lib64gfx.h Sun Sep 24 16:01:17 2017 +0300 +++ b/tools/lib64gfx.h Sun Sep 24 17:47:48 2017 +0300 @@ -64,14 +64,6 @@ }; -// Number of video banks -enum -{ - D64_FLI_2BANK, - D64_FLI_4BANK, - D64_FLI_8BANK, -}; - enum { D64_ILACE_COLOR, @@ -110,10 +102,7 @@ typedef struct _DMC64Image { int type, // Image type (D64_FMT_*) - fliType, // FLI type (if FLI used) - laceType, // Interlace type (D64_ILACE_*) - laceBank1, // Interlace video bank indices - laceBank2; + laceType; // Interlace type (D64_ILACE_*) int width, height; // Width and height in pixels int ch_width, ch_height; // Width and height in charblocks @@ -127,14 +116,14 @@ d020, bgcolor, d022, d023, d024; size_t extraDataSizes[C64_MAX_EXTRA_DATA]; + DMC64Sprite sprites[C64_MAX_SPRITES]; } DMC64Image; typedef Uint8 (*DMC64GetPixelFunc)( - const DMC64Image *img, - const int bits, const int cbank, const int vbank, - const int scroffs, const int raster); + const DMC64Image *img, const int bmoffs, const int scroffs, + const int vshift, const int vbitmap, const int raster); enum {