# HG changeset patch # User Matti Hamalainen # Date 1526254704 -10800 # Node ID f1b279ba47a84a4fa2c7f1aa0b0c87f17aaad05e # Parent fd0d1b4efc83fed88a302b7ab7f28d56778ed26f Remove some useless constants. diff -r fd0d1b4efc83 -r f1b279ba47a8 tools/gfxconv.c --- 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 diff -r fd0d1b4efc83 -r f1b279ba47a8 tools/lib64gfx.h --- 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