move color only flag to -c, color compatible flag to -C

This commit is contained in:
bentley
2010-01-13 10:04:42 -07:00
parent 2d5c193e6d
commit 0b647c5a25

View File

@@ -55,7 +55,7 @@ static void usage(void)
printf("RGBFix v" RGBFIX_VERSION printf("RGBFix v" RGBFIX_VERSION
" (part of ASMotor " ASMOTOR_VERSION ")\n\n"); " (part of ASMotor " ASMOTOR_VERSION ")\n\n");
printf("usage: rgbfix [-dcjoqsv] [-m mbc_type] [-k licensee_str] [-p pad_value]\n"); printf("usage: rgbfix [-Ccdjqsv] [-m mbc_type] [-k licensee_str] [-p pad_value]\n");
printf("\t [-r ram_size] [-t title_str] image[.gb]\n"); printf("\t [-r ram_size] [-t title_str] image[.gb]\n");
exit(EX_USAGE); exit(EX_USAGE);
@@ -188,7 +188,7 @@ main(int argc, char *argv[])
if (argc == 1) if (argc == 1)
usage(); usage();
while ((ch = getopt(argc, argv, "cdjk:m:op:qr:st:v")) != -1) { while ((ch = getopt(argc, argv, "Ccdjk:m:p:qr:st:v")) != -1) {
switch (ch) { switch (ch) {
case 'd': case 'd':
ulOptions |= OPTF_DEBUG; ulOptions |= OPTF_DEBUG;
@@ -234,16 +234,16 @@ main(int argc, char *argv[])
case 'q': case 'q':
ulOptions |= OPTF_QUIET; ulOptions |= OPTF_QUIET;
break; break;
case 'o': case 'c':
if (ulOptions & OPTF_GBCMODE) { if (ulOptions & OPTF_GBCMODE) {
errx(EX_USAGE, "-c and -o can't be used together"); errx(EX_USAGE, "-c and -C can't be used together");
} }
ulOptions |= OPTF_GBCMODE; ulOptions |= OPTF_GBCMODE;
gbc_mode = 0xC0; gbc_mode = 0xC0;
break; break;
case 'c': case 'C':
if (ulOptions & OPTF_GBCMODE) { if (ulOptions & OPTF_GBCMODE) {
errx(EX_USAGE, "-c and -o can't be used together"); errx(EX_USAGE, "-c and -C can't be used together");
} }
ulOptions |= OPTF_GBCMODE; ulOptions |= OPTF_GBCMODE;
gbc_mode = 0x80; gbc_mode = 0x80;
@@ -434,7 +434,7 @@ main(int argc, char *argv[])
} }
} }
/* /*
* -c/-o (Set GBC only/compatible mode) * -C/-c (Set GBC only/compatible mode)
*/ */
if (ulOptions & OPTF_GBCMODE) { if (ulOptions & OPTF_GBCMODE) {
if (!(ulOptions & OPTF_QUIET)) { if (!(ulOptions & OPTF_QUIET)) {
@@ -455,7 +455,7 @@ main(int argc, char *argv[])
if (ulOptions & OPTF_TITLE) { if (ulOptions & OPTF_TITLE) {
if (cartname[0xF]) { if (cartname[0xF]) {
warnx("Last character of cartridge title was overwritten by '-%c' option", gbc_mode == 0x80 ? 'c' : 'o'); warnx("Last character of cartridge title was overwritten by '-%c' option", gbc_mode == 0x80 ? 'C' : 'c');
} }
} }
} }