From 6f0ffcf3e17f342567e24ad88029d82b4dd0e08a Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Tue, 21 Nov 2023 17:30:34 -0500
Subject: [PATCH] Remove deprecated RGBGFX options (#1246)

---
 contrib/zsh_compl/_rgbgfx |  2 +-
 src/gfx/main.cpp          | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/contrib/zsh_compl/_rgbgfx b/contrib/zsh_compl/_rgbgfx
index 809cb213..408189f3 100644
--- a/contrib/zsh_compl/_rgbgfx
+++ b/contrib/zsh_compl/_rgbgfx
@@ -22,7 +22,7 @@ local args=(
 	'(-t --tilemap -T --auto-tilemap)'{-T,--auto-tilemap}'[Shortcut for -t <file>.tilemap]'
 	'(-u --unique-tiles)'{-u,--unique-tiles}'[Eliminate redundant tiles]'
 	{-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'
 	'(-b --base-tiles)'{-b,--base-tiles}'+[Base tile IDs for tile map output]:base tile IDs:'
diff --git a/src/gfx/main.cpp b/src/gfx/main.cpp
index c74921a2..963a0fcb 100644
--- a/src/gfx/main.cpp
+++ b/src/gfx/main.cpp
@@ -119,11 +119,7 @@ static struct option const longopts[] = {
     {"base-tiles",         required_argument, NULL, 'b'},
     {"color-curve",        no_argument,       NULL, 'C'},
     {"colors",             required_argument, NULL, 'c'},
-    {"debug",              no_argument,       NULL, 'D'}, // Ignored
     {"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'},
     {"mirror-tiles",       no_argument,       NULL, 'm'},
     {"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);
 			}
 			break;
-		case 'h':
-			warning("`-h` is deprecated, use `-Z` instead");
-			[[fallthrough]];
 		case 'Z':
 			options.columnMajor = true;
 			break;
@@ -588,11 +581,6 @@ static char *parseArgv(int argc, char **argv) {
 				registerInput(musl_optarg);
 			}
 			break;
-		case 'D':
-		case 'F':
-		case 'f':
-			warning("Ignoring retired option `-%c`", ch);
-			break;
 		default:
 			fprintf(stderr, "FATAL: unknown option '%c'\n", ch);
 			printUsage();