gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated RGBGFX options (#1246)

Browse Source
This commit is contained in:
Rangi
2023-11-21 17:30:34 -05:00
committed by GitHub
parent c7b39f094c
commit 6f0ffcf3e1
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/zsh_compl/_rgbgfx
View File

@@ -22,7 +22,7 @@ local args=(
'(-t --tilemap -T --auto-tilemap)'{-T,--auto-tilemap}'[Shortcut for -t <file>.tilemap]' '(-t --tilemap -T --auto-tilemap)'{-T,--auto-tilemap}'[Shortcut for -t <file>.tilemap]'
'(-u --unique-tiles)'{-u,--unique-tiles}'[Eliminate redundant tiles]' '(-u --unique-tiles)'{-u,--unique-tiles}'[Eliminate redundant tiles]'
{-v,--verbose}'[Enable verbose output]' {-v,--verbose}'[Enable verbose output]'
'(-h --horizontal -Z --columns)'{-Z,--columns}'[Read the image in column-major order]' '(-Z --columns)'{-Z,--columns}'[Read the image in column-major order]'
'(-a --attr-map -A --auto-attr-map)'{-a,--attr-map}'+[Generate a map of tile attributes (mirroring)]:attrmap file:_files' '(-a --attr-map -A --auto-attr-map)'{-a,--attr-map}'+[Generate a map of tile attributes (mirroring)]:attrmap file:_files'
'(-b --base-tiles)'{-b,--base-tiles}'+[Base tile IDs for tile map output]:base tile IDs:' '(-b --base-tiles)'{-b,--base-tiles}'+[Base tile IDs for tile map output]:base tile IDs:'

12
src/gfx/main.cpp
View File

@@ -119,11 +119,7 @@ static struct option const longopts[] = {
{"base-tiles", required_argument, NULL, 'b'}, {"base-tiles", required_argument, NULL, 'b'},
{"color-curve", no_argument, NULL, 'C'}, {"color-curve", no_argument, NULL, 'C'},
{"colors", required_argument, NULL, 'c'}, {"colors", required_argument, NULL, 'c'},
{"debug", no_argument, NULL, 'D'}, // Ignored
{"depth", required_argument, NULL, 'd'}, {"depth", required_argument, NULL, 'd'},
{"fix", no_argument, NULL, 'f'},
{"fix-and-save", no_argument, NULL, 'F'}, // Deprecated
{"horizontal", no_argument, NULL, 'h'}, // Deprecated
{"slice", required_argument, NULL, 'L'}, {"slice", required_argument, NULL, 'L'},
{"mirror-tiles", no_argument, NULL, 'm'}, {"mirror-tiles", no_argument, NULL, 'm'},
{"nb-tiles", required_argument, NULL, 'N'}, {"nb-tiles", required_argument, NULL, 'N'},
@@ -574,9 +570,6 @@ static char *parseArgv(int argc, char **argv) {
error("Tile trim (-x) argument must be a valid number, not \"%s\"", musl_optarg); error("Tile trim (-x) argument must be a valid number, not \"%s\"", musl_optarg);
} }
break; break;
case 'h':
warning("`-h` is deprecated, use `-Z` instead");
[[fallthrough]];
case 'Z': case 'Z':
options.columnMajor = true; options.columnMajor = true;
break; break;
@@ -588,11 +581,6 @@ static char *parseArgv(int argc, char **argv) {
registerInput(musl_optarg); registerInput(musl_optarg);
} }
break; break;
case 'D':
case 'F':
case 'f':
warning("Ignoring retired option `-%c`", ch);
break;
default: default:
fprintf(stderr, "FATAL: unknown option '%c'\n", ch); fprintf(stderr, "FATAL: unknown option '%c'\n", ch);
printUsage(); printUsage();