changeset 1643:1834a477e0e2

Merged.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 28 May 2018 19:58:08 +0300
parents 8fb4e8c825d6 (current diff) 58ef0124394d (diff)
children 9d9a0e852b3d
files
diffstat 1 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/tools/lib64gfx.h	Mon May 28 15:54:03 2018 +0300
+++ b/tools/lib64gfx.h	Mon May 28 19:58:08 2018 +0300
@@ -50,23 +50,22 @@
 #define DM_GET_ADDR_HI(addr) (((addr) >> 8) & 0xff)
 
 
-// Different supported C64 bitmap "modes"
+// Different supported flags/modes
 enum
 {
-    D64_FMT_HIRES        = 0x0000,
-    D64_FMT_MC           = 0x0001,
-    D64_FMT_ILACE        = 0x0002,
-    D64_FMT_FLI          = 0x0004,
-    D64_FMT_CHAR         = 0x0008,
-
-    D64_FMT_MODE_MASK    = 0x000f,
-
+    D64_FMT_HIRES        = 0x0000, // Hi-res
+    D64_FMT_MC           = 0x0001, // MultiColor
+    D64_FMT_ILACE        = 0x0002, // Interlace
+    D64_FMT_FLI          = 0x0004, // FLI
+    D64_FMT_CHAR         = 0x0008, // Character mode
 };
 
+
+// Different types of interlace
 enum
 {
-    D64_ILACE_RES,
-    D64_ILACE_COLOR,
+    D64_ILACE_RES        = 0x0001, // Interlace doubles resolution
+    D64_ILACE_COLOR      = 0x0002, // Uses color mixing
 };
 
 
@@ -203,6 +202,9 @@
 } DMC64ImageFormat;
 
 
+//
+// Compression types
+//
 #define DM_COMP_RLE_MARKER1   1
 #define DM_COMP_RLE_MARKER2   2
 #define DM_COMP_RLE_MASK      3