From: Holger Schemel Date: Wed, 10 Apr 2024 07:35:48 +0000 (+0200) Subject: minor code formatting changes X-Git-Tag: 4.4.0.0-test-1~84 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=ab894ca895d1aeffb2db06561dab133b465262bc;p=rocksndiamonds.git minor code formatting changes --- diff --git a/src/game_bd/bd_colors.h b/src/game_bd/bd_colors.h index 21cc82d7..a517d018 100644 --- a/src/game_bd/bd_colors.h +++ b/src/game_bd/bd_colors.h @@ -39,45 +39,45 @@ typedef enum _color_type } GdColorType; // traditional c64 color indexes. -#define GD_COLOR_INDEX_BLACK (0) -#define GD_COLOR_INDEX_WHITE (1) -#define GD_COLOR_INDEX_RED (2) -#define GD_COLOR_INDEX_PURPLE (4) -#define GD_COLOR_INDEX_CYAN (3) -#define GD_COLOR_INDEX_GREEN (5) -#define GD_COLOR_INDEX_BLUE (6) -#define GD_COLOR_INDEX_YELLOW (7) -#define GD_COLOR_INDEX_ORANGE (8) -#define GD_COLOR_INDEX_BROWN (9) -#define GD_COLOR_INDEX_LIGHTRED (10) -#define GD_COLOR_INDEX_GRAY1 (11) -#define GD_COLOR_INDEX_GRAY2 (12) -#define GD_COLOR_INDEX_LIGHTGREEN (13) -#define GD_COLOR_INDEX_LIGHTBLUE (14) -#define GD_COLOR_INDEX_GRAY3 (15) - -#define GD_GDASH_BLACK (gd_gdash_color(GD_COLOR_INDEX_BLACK)) -#define GD_GDASH_WHITE (gd_gdash_color(GD_COLOR_INDEX_WHITE)) -#define GD_GDASH_RED (gd_gdash_color(GD_COLOR_INDEX_RED)) -#define GD_GDASH_PURPLE (gd_gdash_color(GD_COLOR_INDEX_PURPLE)) -#define GD_GDASH_CYAN (gd_gdash_color(GD_COLOR_INDEX_CYAN)) -#define GD_GDASH_GREEN (gd_gdash_color(GD_COLOR_INDEX_GREEN)) -#define GD_GDASH_BLUE (gd_gdash_color(GD_COLOR_INDEX_BLUE)) -#define GD_GDASH_YELLOW (gd_gdash_color(GD_COLOR_INDEX_YELLOW)) -#define GD_GDASH_ORANGE (gd_gdash_color(GD_COLOR_INDEX_ORANGE)) -#define GD_GDASH_BROWN (gd_gdash_color(GD_COLOR_INDEX_BROWN)) -#define GD_GDASH_LIGHTRED (gd_gdash_color(GD_COLOR_INDEX_LIGHTRED)) -#define GD_GDASH_GRAY1 (gd_gdash_color(GD_COLOR_INDEX_GRAY1)) -#define GD_GDASH_GRAY2 (gd_gdash_color(GD_COLOR_INDEX_GRAY2)) -#define GD_GDASH_LIGHTGREEN (gd_gdash_color(GD_COLOR_INDEX_LIGHTGREEN)) -#define GD_GDASH_LIGHTBLUE (gd_gdash_color(GD_COLOR_INDEX_LIGHTBLUE)) -#define GD_GDASH_GRAY3 (gd_gdash_color(GD_COLOR_INDEX_GRAY3)) - -#define GD_GDASH_MIDDLEBLUE (gd_gdash_color(16)) - -#define GD_COLOR_INVALID (0xFFFFFFFF) - -#define GD_C64_COLOR(index) ((GD_COLOR_TYPE_C64 << 24) + (index)) +#define GD_COLOR_INDEX_BLACK 0 +#define GD_COLOR_INDEX_WHITE 1 +#define GD_COLOR_INDEX_RED 2 +#define GD_COLOR_INDEX_CYAN 3 +#define GD_COLOR_INDEX_PURPLE 4 +#define GD_COLOR_INDEX_GREEN 5 +#define GD_COLOR_INDEX_BLUE 6 +#define GD_COLOR_INDEX_YELLOW 7 +#define GD_COLOR_INDEX_ORANGE 8 +#define GD_COLOR_INDEX_BROWN 9 +#define GD_COLOR_INDEX_LIGHTRED 10 +#define GD_COLOR_INDEX_GRAY1 11 +#define GD_COLOR_INDEX_GRAY2 12 +#define GD_COLOR_INDEX_LIGHTGREEN 13 +#define GD_COLOR_INDEX_LIGHTBLUE 14 +#define GD_COLOR_INDEX_GRAY3 15 + +#define GD_GDASH_BLACK gd_gdash_color(GD_COLOR_INDEX_BLACK) +#define GD_GDASH_WHITE gd_gdash_color(GD_COLOR_INDEX_WHITE) +#define GD_GDASH_RED gd_gdash_color(GD_COLOR_INDEX_RED) +#define GD_GDASH_CYAN gd_gdash_color(GD_COLOR_INDEX_CYAN) +#define GD_GDASH_PURPLE gd_gdash_color(GD_COLOR_INDEX_PURPLE) +#define GD_GDASH_GREEN gd_gdash_color(GD_COLOR_INDEX_GREEN) +#define GD_GDASH_BLUE gd_gdash_color(GD_COLOR_INDEX_BLUE) +#define GD_GDASH_YELLOW gd_gdash_color(GD_COLOR_INDEX_YELLOW) +#define GD_GDASH_ORANGE gd_gdash_color(GD_COLOR_INDEX_ORANGE) +#define GD_GDASH_BROWN gd_gdash_color(GD_COLOR_INDEX_BROWN) +#define GD_GDASH_LIGHTRED gd_gdash_color(GD_COLOR_INDEX_LIGHTRED) +#define GD_GDASH_GRAY1 gd_gdash_color(GD_COLOR_INDEX_GRAY1) +#define GD_GDASH_GRAY2 gd_gdash_color(GD_COLOR_INDEX_GRAY2) +#define GD_GDASH_LIGHTGREEN gd_gdash_color(GD_COLOR_INDEX_LIGHTGREEN) +#define GD_GDASH_LIGHTBLUE gd_gdash_color(GD_COLOR_INDEX_LIGHTBLUE) +#define GD_GDASH_GRAY3 gd_gdash_color(GD_COLOR_INDEX_GRAY3) + +#define GD_GDASH_MIDDLEBLUE gd_gdash_color(16) + +#define GD_COLOR_INVALID 0xFFFFFFFF + +#define GD_C64_COLOR(index) ((GD_COLOR_TYPE_C64 << 24) + (index)) // color