Mercurial > hg > early-roguelike
view rogue5/options.c @ 111:7f8f43943b1f
Fix some terribly depressing corruption during restore.
In rogue5/state.c, rs_read_daemons() zeroes out the argument and delay
if the daemon slot is empty. Unfortunately that code ended up on the
wrong side of the brace that closes the for loop, so instead of running
after each daemon, it got run once after the loop exited, when the
index was of course out of bounds.
This tended to manifest, when compiled with -O2, by overwriting hw and
setting it to NULL. When inventory() next ran, hw would be passed to
wgetch(), which returns ERR when it gets a NULL argument. This made
md_readchar() think something was wrong and autosave the game.
Upon investigation, rogue3 was found to commit the same mistake.
rogue4 and srogue don't zero the data. arogue5 already does it
properly.
Someday I am going to run all this through Valgrind. Someday when I
am a kinder person who will not be driven to invoke hordes of trolls
and centaurs upon the original authors.
author | John "Elwin" Edwards |
---|---|
date | Wed, 08 Jan 2014 16:44:16 -0500 |
parents | 655c317b6237 |
children |
line wrap: on
line source
/* * This file has all the code for the option command. I would rather * this command were not necessary, but it is the only way to keep the * wolves off of my back. * * @(#)options.c 4.24 (Berkeley) 05/10/83 * * Rogue: Exploring the Dungeons of Doom * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman * All rights reserved. * * See the file LICENSE.TXT for full copyright and licensing information. */ #include <stdlib.h> #include <curses.h> #include <ctype.h> #include <string.h> #include "rogue.h" #define EQSTR(a, b, c) (strncmp(a, b, c) == 0) #define NUM_OPTS (sizeof optlist / sizeof (OPTION)) /* * description of an option and what to do with it */ struct optstruct { char *o_name; /* option name */ char *o_prompt; /* prompt for interactive entry */ void *o_opt; /* pointer to thing to set */ /* function to print value */ void (*o_putfunc)(void *opt); /* function to get value interactively */ int (*o_getfunc)(void *opt, WINDOW *win); }; typedef struct optstruct OPTION; void pr_optname(const OPTION *op); int allowchange(const OPTION *op); static const OPTION optlist[] = { {"terse", "Terse output", &terse, put_bool, get_bool }, {"flush", "Flush typeahead during battle", &fight_flush, put_bool, get_bool }, {"jump", "Show position only at end of run", &jump, put_bool, get_bool }, {"seefloor", "Show the lamp-illuminated floor", &see_floor, put_bool, get_sf }, {"passgo", "Follow turnings in passageways", &passgo, put_bool, get_bool }, {"tombstone", "Print out tombstone when killed", &tombstone, put_bool, get_bool }, {"inven", "Inventory style", &inv_type, put_inv_t, get_inv_t }, {"name", "Name", whoami, put_str, get_str }, {"fruit", "Fruit", fruit, put_str, get_str }, {"file", "Save file", file_name, put_str, get_str } }; /* * option: * Print and then set options from the terminal */ void option(void) { const OPTION *op; int retval; wclear(hw); /* * Display current values of options */ for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) { if (allowchange(op)) { pr_optname(op); (*op->o_putfunc)(op->o_opt); waddch(hw, '\n'); } } /* * Set values */ wmove(hw, 0, 0); for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) { if (!allowchange(op)) continue; pr_optname(op); retval = (*op->o_getfunc)(op->o_opt, hw); if (retval) { if (retval == QUIT) break; #if 0 /* Support for MINUS removed until this section is rewritten. */ else if (op > optlist) { /* MINUS */ wmove(hw, (int)(op - optlist) - 1, 0); op -= 2; } else /* trying to back up beyond the top */ { putchar('\007'); wmove(hw, 0, 0); op--; } #else break; #endif } } /* * Switch back to original screen */ wmove(hw, LINES - 1, 0); waddstr(hw, "--Press space to continue--"); wrefresh(hw); wait_for(hw, ' '); clearok(curscr, TRUE); touchwin(stdscr); after = FALSE; } /* * pr_optname: * Print out the option name prompt */ void pr_optname(const OPTION *op) { wprintw(hw, "%s (\"%s\"): ", op->o_prompt, op->o_name); } /* * put_bool * Put out a boolean */ void put_bool(void *b) { waddstr(hw, *(int *) b ? "True" : "False"); } /* * put_str: * Put out a string */ void put_str(void *str) { waddstr(hw, (char *) str); } /* * put_inv_t: * Put out an inventory type */ void put_inv_t(void *ip) { waddstr(hw, inv_t_name[*(int *) ip]); } /* * get_bool: * Allow changing a boolean option and print it out */ int get_bool(void *vp, WINDOW *win) { int *bp = (int *) vp; int oy, ox; int op_bad; op_bad = TRUE; getyx(win, oy, ox); waddstr(win, *bp ? "True" : "False"); while (op_bad) { wmove(win, oy, ox); wrefresh(win); switch (wreadchar(win)) { case 't': case 'T': *bp = TRUE; op_bad = FALSE; break; case 'f': case 'F': *bp = FALSE; op_bad = FALSE; break; case '\n': case '\r': op_bad = FALSE; break; case ESCAPE: return QUIT; case '-': return MINUS; default: wmove(win, oy, ox + 10); waddstr(win, "(T or F)"); } } wmove(win, oy, ox); waddstr(win, *bp ? "True" : "False"); waddch(win, '\n'); return NORM; } /* * get_sf: * Change value and handle transition problems from see_floor to * !see_floor. */ int get_sf(void *vp, WINDOW *win) { int *bp = (int *) vp; int was_sf; int retval; was_sf = see_floor; retval = get_bool(bp, win); if (retval == QUIT) return(QUIT); if (was_sf != see_floor) { if (!see_floor) { see_floor = TRUE; erase_lamp(&hero, proom); see_floor = FALSE; } else look(FALSE); } return(NORM); } /* * get_str: * Set a string option */ #define MAXINP 50 /* max string to read from terminal or environment */ int get_str(void *vopt, WINDOW *win) { char *opt = (char *) vopt; char *sp; int oy, ox; size_t i; int c; static char buf[MAXSTR]; getyx(win, oy, ox); wrefresh(win); /* * loop reading in the string, and put it in a temporary buffer */ for (sp = buf; (c = wreadchar(win)) != '\n' && c != '\r' && c != ESCAPE; wclrtoeol(win), wrefresh(win)) { if (c == -1) continue; else if (c == erasechar()) /* process erase character */ { if (sp > buf) { sp--; for (i = strlen(unctrl(*sp)); i; i--) waddch(win, '\b'); } continue; } else if (c == killchar()) /* process kill character */ { sp = buf; wmove(win, oy, ox); continue; } else if (sp == buf) { if (c == '-' && win != stdscr) break; else if (c == '~') { strcpy(buf, home); waddstr(win, home); sp += strlen(home); continue; } } if (sp >= &buf[MAXINP] || !(isprint(c) || c == ' ')) putchar(CTRL('G')); else { *sp++ = (char) c; waddstr(win, unctrl(c)); } } *sp = '\0'; if (sp > buf) /* only change option if something has been typed */ strucpy(opt, buf, strlen(buf)); mvwprintw(win, oy, ox, "%s\n", opt); wrefresh(win); if (win == stdscr) mpos += (int)(sp - buf); if (c == '-') return MINUS; else if (c == ESCAPE) return QUIT; else return NORM; } /* * get_inv_t * Get an inventory type name */ int get_inv_t(void *vp, WINDOW *win) { int *ip = (int *) vp; int oy, ox; int op_bad; op_bad = TRUE; getyx(win, oy, ox); waddstr(win, inv_t_name[*ip]); while (op_bad) { wmove(win, oy, ox); wrefresh(win); switch (wreadchar(win)) { case 'o': case 'O': *ip = INV_OVER; op_bad = FALSE; break; case 's': case 'S': *ip = INV_SLOW; op_bad = FALSE; break; case 'c': case 'C': *ip = INV_CLEAR; op_bad = FALSE; break; case '\n': case '\r': op_bad = FALSE; break; case ESCAPE: return QUIT; case '-': return MINUS; default: wmove(win, oy, ox + 15); waddstr(win, "(O, S, or C)"); } } mvwprintw(win, oy, ox, "%s\n", inv_t_name[*ip]); return NORM; } #ifdef MASTER /* * get_num: * Get a numeric option */ int get_num(void *vp, WINDOW *win) { int *opt = (int *) vp; int i; static char buf[MAXSTR]; if ((i = get_str(buf, win)) == NORM) *opt = atoi(buf); return i; } #endif /* * parse_opts: * Parse options from string, usually taken from the environment. * The string is a series of comma seperated values, with booleans * being stated as "name" (true) or "noname" (false), and strings * being "name=....", with the string being defined up to a comma * or the end of the entire option string. */ void parse_opts(char *str) { char *sp; const OPTION *op; int len; const char **i; char *start; while (*str) { /* * Get option name */ for (sp = str; isalpha((int)*sp); sp++) continue; len = (int)(sp - str); /* * Look it up and deal with it */ for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) { if (!allowchange(op)) continue; if (EQSTR(str, op->o_name, len)) { if (op->o_putfunc == put_bool) /* if option is a boolean */ *(int *)op->o_opt = TRUE; /* NOSTRICT */ else /* string option */ { /* * Skip to start of string value */ for (str = sp + 1; *str == '='; str++) continue; if (*str == '~') { strcpy((char *) op->o_opt, home); /* NOSTRICT */ start = (char *) op->o_opt + strlen(home);/* NOSTRICT */ while (*++str == '/') continue; } else start = (char *) op->o_opt; /* NOSTRICT */ /* * Skip to end of string value */ for (sp = str + 1; *sp && *sp != ','; sp++) continue; /* * check for type of inventory */ if (op->o_putfunc == put_inv_t) { if (islower((int)*str)) *str = (char) toupper(*str); for (i = inv_t_name; i <= &inv_t_name[INV_CLEAR]; i++) if (strncmp(str, *i, sp - str) == 0) { inv_type = (int)(i - inv_t_name); break; } } else strucpy(start, str, (size_t)(sp - str)); } break; } /* * check for "noname" for booleans */ else if (op->o_putfunc == put_bool && EQSTR(str, "no", 2) && EQSTR(str + 2, op->o_name, len - 2)) { *(int *)op->o_opt = FALSE; /* NOSTRICT */ break; } } /* * skip to start of next option name */ while (*sp && !isalpha((int)*sp)) sp++; str = sp; } } /* * strucpy: * Copy string using unctrl for things */ void strucpy(char *s1, const char *s2, size_t len) { if (len > MAXINP) len = MAXINP; while (len--) { if (isprint((int)*s2) || *s2 == ' ') *s1++ = *s2; s2++; } *s1 = '\0'; } /* Tells whether the user is allowed to change the option. */ int allowchange(const OPTION *opt) { if (!use_savedir) return TRUE; if (!strcmp(opt->o_name, "name")) return FALSE; if (!strcmp(opt->o_name, "file")) return FALSE; return TRUE; }