nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix some problems with option modification settings in the

Browse Source 
new options processing.
This commit is contained in:
nethack.allison
2002-02-08 01:34:22 +00:00
parent b7f7985821
commit 6b75832e51
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.c
+14 -14
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)options.c 3.4 2002/02/04 */ /* SCCS Id: @(#)options.c 3.4 2002/02/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1134,7 +1134,7 @@ boolean tinitial, tfrom_file;
wintype = NHW_STATUS; wintype = NHW_STATUS;
if (wintype > 0 && if (wintype > 0 &&
(op = string_for_env_opt(fullname, opts, FALSE)) != 0) { (op = string_for_opt(opts, FALSE)) != 0) {
wc_set_font_name(wintype, op); wc_set_font_name(wintype, op);
#ifdef MAC #ifdef MAC
set_font_name (wintype, op); set_font_name (wintype, op);
@@ -1153,7 +1153,7 @@ boolean tinitial, tfrom_file;
wintype = NHW_STATUS; wintype = NHW_STATUS;
if (wintype > 0 && !negated && if (wintype > 0 && !negated &&
(op = string_for_env_opt(fullname, opts, FALSE)) != 0) { (op = string_for_opt(opts, FALSE)) != 0) {
switch(wintype) { switch(wintype) {
case NHW_MAP: case NHW_MAP:
iflags.wc_fontsiz_map = atoi(op); iflags.wc_fontsiz_map = atoi(op);
@@ -1481,8 +1481,8 @@ goodfruit:
* align_status:[left|top|right|bottom] */ * align_status:[left|top|right|bottom] */
fullname = "align_status"; fullname = "align_status";
if (match_optname(opts, fullname, sizeof("align_status")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("align_status")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if (!negated) { if (op && !negated) {
if (!strncmpi (op, "left", sizeof("left")-1)) if (!strncmpi (op, "left", sizeof("left")-1))
iflags.wc_align_status = ALIGN_LEFT; iflags.wc_align_status = ALIGN_LEFT;
else if (!strncmpi (op, "top", sizeof("top")-1)) else if (!strncmpi (op, "top", sizeof("top")-1))
@@ -1500,8 +1500,8 @@ goodfruit:
* align_message:[left|top|right|bottom] */ * align_message:[left|top|right|bottom] */
fullname = "align_message"; fullname = "align_message";
if (match_optname(opts, fullname, sizeof("align_message")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("align_message")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if (!negated) { if (op && !negated) {
if (!strncmpi (op, "left", sizeof("left")-1)) if (!strncmpi (op, "left", sizeof("left")-1))
iflags.wc_align_message = ALIGN_LEFT; iflags.wc_align_message = ALIGN_LEFT;
else if (!strncmpi (op, "top", sizeof("top")-1)) else if (!strncmpi (op, "top", sizeof("top")-1))
@@ -1835,8 +1835,8 @@ goodfruit:
ascii15x12|ascii12x16|ascii10x18|fit_to_screen] */ ascii15x12|ascii12x16|ascii10x18|fit_to_screen] */
fullname = "map_mode"; fullname = "map_mode";
if (match_optname(opts, fullname, sizeof("map_mode")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("map_mode")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if (!negated) { if (op && !negated) {
if (!strncmpi (op, "tiles", sizeof("tiles")-1)) if (!strncmpi (op, "tiles", sizeof("tiles")-1))
iflags.wc_map_mode = MAP_MODE_TILES; iflags.wc_map_mode = MAP_MODE_TILES;
else if (!strncmpi (op, "ascii4x6", sizeof("ascii4x6")-1)) else if (!strncmpi (op, "ascii4x6", sizeof("ascii4x6")-1))
@@ -1868,7 +1868,7 @@ goodfruit:
* scroll_margin:nn */ * scroll_margin:nn */
fullname = "scroll_margin"; fullname = "scroll_margin";
if (match_optname(opts, fullname, sizeof("scroll_margin")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("scroll_margin")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if ((negated && !op) || (!negated && op)) { if ((negated && !op) || (!negated && op)) {
iflags.wc_scroll_margin = negated ? 5 : atoi(op); iflags.wc_scroll_margin = negated ? 5 : atoi(op);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);
@@ -1878,7 +1878,7 @@ goodfruit:
* tile_width:nn */ * tile_width:nn */
fullname = "tile_width"; fullname = "tile_width";
if (match_optname(opts, fullname, sizeof("tile_width")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("tile_width")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if ((negated && !op) || (!negated && op)) { if ((negated && !op) || (!negated && op)) {
iflags.wc_tile_width = negated ? 0 : atoi(op); iflags.wc_tile_width = negated ? 0 : atoi(op);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);
@@ -1888,7 +1888,7 @@ goodfruit:
* tile_file:name */ * tile_file:name */
fullname = "tile_file"; fullname = "tile_file";
if (match_optname(opts, fullname, sizeof("tile_file")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("tile_file")-1, TRUE)) {
if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) { if ((op = string_for_opt(opts, FALSE)) != 0) {
if (iflags.wc_tile_file) free(iflags.wc_tile_file); if (iflags.wc_tile_file) free(iflags.wc_tile_file);
iflags.wc_tile_file = (char *)alloc(strlen(op) + 1); iflags.wc_tile_file = (char *)alloc(strlen(op) + 1);
Strcpy(iflags.wc_tile_file, op); Strcpy(iflags.wc_tile_file, op);
@@ -1899,7 +1899,7 @@ goodfruit:
* tile_height:nn */ * tile_height:nn */
fullname = "tile_height"; fullname = "tile_height";
if (match_optname(opts, fullname, sizeof("tile_height")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("tile_height")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if ((negated && !op) || (!negated && op)) { if ((negated && !op) || (!negated && op)) {
iflags.wc_tile_height = negated ? 0 : atoi(op); iflags.wc_tile_height = negated ? 0 : atoi(op);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);
@@ -1909,7 +1909,7 @@ goodfruit:
* vary_msgcount:nn */ * vary_msgcount:nn */
fullname = "vary_msgcount"; fullname = "vary_msgcount";
if (match_optname(opts, fullname, sizeof("vary_msgcount")-1, TRUE)) { if (match_optname(opts, fullname, sizeof("vary_msgcount")-1, TRUE)) {
op = string_for_env_opt(fullname, opts, negated); op = string_for_opt(opts, negated);
if ((negated && !op) || (!negated && op)) { if ((negated && !op) || (!negated && op)) {
iflags.wc_vary_msgcount = negated ? 0 : atoi(op); iflags.wc_vary_msgcount = negated ? 0 : atoi(op);
} else if (negated) bad_negation(fullname, TRUE); } else if (negated) bad_negation(fullname, TRUE);