Early Roguelike Collection: urogue/options.c annotate

annotate urogue/options.c @ 258:2908dc47f9e2

UltraRogue: fix crash when restoring. The r_flags field in struct room was being written as an int and read as a short. This caused the restore functions to receive the wrong data, usually an impossible string length, and abort. This breaks save compatibility, though the save files had problems anyway: the r_fires field should have been used, instead of reading and writing r_flags twice.

author	John "Elwin" Edwards
date	Wed, 08 Feb 2017 19:50:36 -0500
parents	c495a4f288c6
children	ac42afd962e4

rev	line source
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 options.c - This file has all the code for the option command
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 UltraRogue: The Ultimate Adventure in the Dungeons of Doom
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 Copyright (C) 1985, 1986, 1992, 1993, 1995 Herb Chong
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 Based on "Advanced Rogue"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 Based on "Rogue: Exploring the Dungeons of Doom"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 See the file LICENSE.TXT for full copyright and licensing information.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19 #include <string.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <ctype.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "rogue.h"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 #define NUM_OPTS (sizeof optlist / sizeof (OPTION))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 #define EQSTR(a, b, c) (strncmp(a, b, c) == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 /* description of an option and what to do with it */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 static OPTION optlist[] =
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 {"jump","Show position only at end of run (jump): ", &jump,put_bool,get_bool},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 {"inven","Style of inventories (inven): ", &inv_type, put_inv, get_inv},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 {"askme","Ask me about unidentified things (askme): ",&askme,put_bool,get_bool},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 {"doorstop","Stop running when adjacent (doorstop): ",&doorstop,put_bool,get_bool},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 {"name", "Name (name): ", &whoami, put_str, get_str},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 {"fruit", "Fruit (fruit): ", &fruit, put_str, get_str},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 {"file", "Save file (file): ", &file_name, put_str, get_str},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 {"score", "Score file (score): ", &score_file, put_str, get_str},
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 {"class", "Character class (class): ",&char_type, put_abil, get_abil}
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 };
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 option()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 print and then set options from the terminal
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 option(void)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 OPTION *op;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 int retval;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 wclear(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 touchwin(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 /* Display current values of options */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 for (op = optlist; op < &optlist[NUM_OPTS]; op++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 waddstr(hw, op->o_prompt);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 (*op->o_putfunc)(&op->o_opt, hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 waddch(hw, '\n');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 /* Set values */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 wmove(hw, 0, 0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 for (op = optlist; op < &optlist[NUM_OPTS]; op++)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 waddstr(hw, op->o_prompt);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 retval = (*op->o_getfunc)(&op->o_opt, hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 if (retval)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 if (retval == QUIT)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 break;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 else if (op > optlist) /* MINUS */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 wmove(hw, (int)(op - optlist) - 1, 0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 op -= 2;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 else /* trying to back up beyond the top */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 putchar('\007');
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 wmove(hw, 0, 0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 op--;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 }
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 /* Switch back to original screen */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 mvwaddstr(hw, LINES - 1, 0, spacemsg);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92

Mercurial > hg > early-roguelike

annotate urogue/options.c @ 258:2908dc47f9e2