Mercurial > hg > early-roguelike
view arogue5/mach_dep.h @ 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 | dfeed24bb616 |
children |
line wrap: on
line source
/* * machine dependicies * * Advanced Rogue * Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka and AT&T * All rights reserved. * * Based on "Rogue: Exploring the Dungeons of Doom" * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman * All rights reserved. * * See the file LICENSE.TXT for full copyright and licensing information. */ /* * Things that get set in config.h have been #if 0'd out. You should only * need to set them here if you don't use configure and want to enable those * features. */ /* * define that the wizard commands exist */ #if 0 #undef WIZARD /*1*/ #endif /* * define if you want to limit scores to one per class per userid */ #if 0 #undef LIMITSCORE #endif /* * where scorefile should live */ #if 0 #define SCOREFILE "/var/local/games/roguelike/arogue5.scr" #define LOGFILE "/var/local/games/roguelike/arogue5.log" #define SAVEDIR "/var/local/games/roguelike/arogue5save/" #endif /* * Variables for checking to make sure the system isn't too loaded * for people to play */ #if 0 #undef MAXUSERS /*40*/ /* max number of users for this game */ #undef MAXLOAD /*40*/ /* 10 * max 15 minute load average */ #endif #undef CHECKTIME /*15*/ /* number of minutes between load checks */ /* if not defined checks are only on startup */ #ifdef MAXLOAD #define LOADAV /* defined if rogue should provide loadav() */ #ifdef LOADAV #define NAMELIST "/unix" /* where the system namelist lives */ #endif #endif #ifdef MAXUSERS #define UCOUNT /* defined if rogue should provide ucount() */ #ifdef UCOUNT #define UTMP "/etc/utmp" /* where utmp file lives */ #endif #endif #undef AUTHOR /*212*/ /* * define the current author of the program for "special handling" */ #ifndef AUTHOR #define AUTHOR 0 /* Default to root if not specified above */ #endif