Mercurial > hg > early-roguelike
view srogue/armor.c @ 96:9fb343307b6b
Fix some 'test' failures when running 'make install'.
When shell variables are unexpectedly empty, 'test' gets the wrong
number of arguments and becomes unhappy. Logical AND should not be
done with 'test EXPR1 -a EXPR2' in such cases, because 'test' logic
does not short-circuit. Replace with 'test EXPR1 && test EXPR2'.
Shell logic does short-circuit, and if the first test invocation
fails, the second will never occur, and will never encounter missing
arguments.
author | John "Elwin" Edwards |
---|---|
date | Tue, 27 Aug 2013 22:54:28 -0700 |
parents | 2128c7dc8a40 |
children | 94a0d9dd5ce1 |
line wrap: on
line source
/* * This file contains misc functions for dealing with armor * * @(#)armor.c 9.0 (rdk) 7/17/84 * * Super-Rogue * Copyright (C) 1984 Robert D. Kindelberger * 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. */ #include "rogue.h" #include "rogue.ext" /* * wear: * The player wants to wear something, so let the hero try */ wear() { reg struct linked_list *item; reg struct object *obj; if (cur_armor != NULL) { msg("You are already wearing some."); after = FALSE; return; } if ((item = get_item("wear", ARMOR)) == NULL) return; obj = OBJPTR(item); if (obj->o_type != ARMOR) { msg("You can't wear that."); return; } waste_time(); msg("Wearing %s.", a_magic[obj->o_which].mi_name); cur_armor = obj; setoflg(obj,ISKNOW); nochange = FALSE; } /* * take_off: * Get the armor off of the players back */ take_off() { reg struct object *obj; if ((obj = cur_armor) == NULL) { msg("Not wearing any armor."); return; } if (!dropcheck(cur_armor)) return; cur_armor = NULL; msg("Was wearing %c) %s",pack_char(obj),inv_name(obj,TRUE)); nochange = FALSE; } /* * initarmor: * Initialize some armor. */ initarmor(obj, what) struct object *obj; int what; { struct init_armor *iwa; struct magic_item *mi; obj->o_type = ARMOR; obj->o_which = what; iwa = &armors[what]; mi = &a_magic[what]; obj->o_vol = iwa->a_vol; obj->o_ac = iwa->a_class; obj->o_weight = iwa->a_wght; obj->o_typname = things[TYP_ARMOR].mi_name; } /* * hurt_armor: * Returns TRUE if armor is damaged */ hurt_armor(obj) struct object *obj; { reg int type, ac; if (obj != NULL) { if (o_on(obj, ISPROT) || (o_on(obj, ISBLESS) && rnd(100) < 10)) return FALSE; ac = obj->o_ac; type = obj->o_which; if (type != PADDED && type != LEATHER) if ((type == STUDDED && ac < 8) || (type != STUDDED && ac < 9)) return TRUE; } return FALSE; }