Early Roguelike Collection: urogue/getplay.c annotate

annotate urogue/getplay.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	778938a5c21d

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 getplay.c - Procedures for saving and retrieving a characters starting
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3 attributes, armour, and weapon.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 UltraRogue: The Ultimate Adventure in the Dungeons of Doom
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 Copyright (C) 1985, 1986, 1992, 1993, 1995 Herb Chong
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 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	10 */
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 /* 11/08/83 ???, S.A. Hester */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 #include <stdlib.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15 #include <ctype.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 #include <string.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 #include "rogue.h"
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 #define I_STR 0
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #define I_INTEL 1
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #define I_WISDOM 2
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22 #define I_DEXT 3
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 #define I_CONST 4
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 #define I_CHARISMA 5
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 #define I_HPT 6
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 #define I_POWER 7
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 #define I_CTYPE 8
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 #define MAXPATT 9 /* Total Number of above defines. */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 #define MAXPDEF 10 /* Maximum number of pre-defined chars */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 static int def_array[MAXPDEF][MAXPATT]; /* Pre-def'd chars */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 static void get_chr_filename(char *filename, int size)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 const char *home;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 home = getenv("HOME");
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 if (home) {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 if ((int)strlen(home) < (size - 12) )
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 strcpy(filename, home);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 strcat(filename,"/urogue.chr");
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 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 strncpy(filename,"urogue.chr",size);
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 else
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 strcpy(filename, "urogue.chr");
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
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 int
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 geta_player(void)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 int i;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 FILE *fd;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 char pbuf[2 * LINELEN];
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 char filename[200];
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 get_chr_filename(filename, sizeof(filename));
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 if ((fd = fopen(filename, "r")) == NULL)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 return(FALSE);
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 fread(def_array, sizeof(def_array), 1, fd);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 fclose(fd);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 wclear(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 touchwin(hw);
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 print_stored();
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 mvwaddstr(hw, 0, 0, "Do you wish to select a character? ");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 wrefresh(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 if (readcharw(hw) != 'y')
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 return FALSE;
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 do
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 wmove(hw, LINES - 1, 0);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 wclrtoeol(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 mvwaddstr(hw, 0, 0, "Enter the number of a pre-defined character: ");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 wclrtoeol(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 wrefresh(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 get_string(pbuf, hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 i = atoi(pbuf) - 1;
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 if (i < 0 \|\| i > MAXPDEF - 1)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 wstandout(hw);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 mvwaddstr(hw, 1, 0, "Please use the range 1 to");
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 wprintw(hw, " %d.", MAXPDEF);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset

Mercurial > hg > early-roguelike

annotate urogue/getplay.c @ 258:2908dc47f9e2