From: PatR <rankin@nethack.org>
Date: Mon, 23 Mar 2015 01:22:36 +0000 (-0700)
Subject: {DEC,IBM,MAC}graphics (1 of 2: core)
X-Git-Tag: NetHack-3.6.0_RC01~562
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b571b72f28d61894638f5e66831b93ec2ebed59;p=nethack

{DEC,IBM,MAC}graphics (1 of 2: core)

DECgraphics, IBMgraphics, and MACgraphics used to be recognized when
at least 3 letters were supplied back when they were true boolean
options.  When they got demoted to shortcuts for the symset option,
they started needing 10 (DEC and IBM) or all 11 (MAC), otherwise
triggering "bad syntax in NETHACKOPTIONS" (or config file).  Revert
to having the first three letters be sufficient.
---

diff --git a/src/options.c b/src/options.c
index c21010ab1..147e0a701 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,4 +1,4 @@
-/* NetHack 3.5	options.c	$NHDT-Date: 1427035440 2015/03/22 14:44:00 $  $NHDT-Branch: master $:$NHDT-Revision: 1.163 $ */
+/* NetHack 3.5	options.c	$NHDT-Date: 1427073746 2015/03/23 01:22:26 $  $NHDT-Branch: master $:$NHDT-Revision: 1.164 $ */
 /* NetHack 3.5	options.c	$Date: 2012/04/09 02:56:30 $  $Revision: 1.153 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -2484,7 +2484,7 @@ goodfruit:
 
 #if defined(BACKWARD_COMPAT)
 	fullname = "DECgraphics";
-	if (match_optname(opts, fullname, 10, TRUE)) {
+	if (match_optname(opts, fullname, 3, TRUE)) {
 		boolean badflag = FALSE;
 		if (duplicate) complain_about_duplicate(opts,1);
 		if (!negated) {
@@ -2508,7 +2508,7 @@ goodfruit:
 		return;
 	}
 	fullname = "IBMgraphics";
-	if (match_optname(opts, fullname, 10, TRUE)) {
+	if (match_optname(opts, fullname, 3, TRUE)) {
 		const char *sym_name = fullname;
 		boolean badflag = FALSE;
 		if (duplicate) complain_about_duplicate(opts,1);
@@ -2542,7 +2542,7 @@ goodfruit:
 #endif
 #ifdef MAC_GRAPHICS_ENV
 	fullname = "MACgraphics";
-	if (match_optname(opts, fullname, 11, TRUE)) {
+	if (match_optname(opts, fullname, 3, TRUE)) {
 		boolean badflag = FALSE;
 		if (duplicate) complain_about_duplicate(opts,1);
 		if (!negated) {