Mercurial > hg > dmlib

changeset 1584:f1b279ba47a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some useless constants.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 14 May 2018 02:38:24 +0300
parents fd0d1b4efc83
children a076c9d9b321 3c9e5962eca6
files tools/gfxconv.c tools/lib64gfx.h
diffstat 2 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tools/gfxconv.c	Mon May 14 00:09:36 2018 +0300
+++ b/tools/gfxconv.c	Mon May 14 02:38:24 2018 +0300
@@ -104,7 +104,7 @@
         optRemapRemove = FALSE;
 int     optNRemapTable = 0;
 DMMapValue optRemapTable[DM_MAX_COLORS];
-int     optColors[C64_MAX_COLORS];
+int     optColors[C64_NCOLORS];
 
 DMImageConvSpec optSpec =
 {
@@ -561,7 +561,7 @@
             {
                 int index, ncolors;
                 if (!dmParseMapOptionString(optArg, optColors,
-                    &ncolors, C64_MAX_COLORS, FALSE, "color table option"))
+                    &ncolors, C64_NCOLORS, FALSE, "color table option"))
                     return FALSE;
 
                 dmMsg(1, "Set color table: ");
@@ -1581,7 +1581,7 @@
     int i;
 
     // Default colors
-    for (i = 0; i < C64_MAX_COLORS; i++)
+    for (i = 0; i < C64_NCOLORS; i++)
         optColors[i] = i;
 
     // Initialize and parse commandline
--- a/tools/lib64gfx.h	Mon May 14 00:09:36 2018 +0300
+++ b/tools/lib64gfx.h	Mon May 14 02:38:24 2018 +0300
@@ -22,9 +22,6 @@
 #define C64_SCR_HEIGHT         200
 #define C64_SCR_CH_WIDTH       (C64_SCR_WIDTH/8)
 #define C64_SCR_CH_HEIGHT      (C64_SCR_HEIGHT/8)
-#define C64_SCR_COLOR_SIZE     (C64_SCR_CH_WIDTH * C64_SCR_CH_HEIGHT)
-#define C64_SCR_SCREEN_SIZE    (C64_SCR_CH_WIDTH * C64_SCR_CH_HEIGHT)
-#define C64_SCR_BITMAP_SIZE    ((C64_SCR_WIDTH * C64_SCR_HEIGHT)/8)
 #define C64_MAX_EXTRA_DATA     64
 
 // C64 video screen pixel aspect ratio on PAL
@@ -43,9 +40,7 @@
 #define C64_CHR_SIZE           (C64_CHR_WIDTH * C64_CHR_HEIGHT)
 
 // Etc.
-#define C64_RAM_SIZE           (64*1024)
 #define C64_NCOLORS            16
-#define C64_MAX_COLORS         16
 #define C64_VIDBANK_SIZE       (16*1024)
 #define C64_MAX_SPRITES        (C64_VIDBANK_SIZE / C64_SPR_SIZE)
 #define C64_MAX_CHARS          256