Early Roguelike Collection: srogue/scrolls.c annotate

annotate srogue/scrolls.c @ 152:0c775afe0072

arogue7, xrogue: fix command repetition. In both games, command() loops and calls the action function twice for each command: once to schedule it by setting player.t_action and player.t_no_move, and again, to actually do it, once player.t_no_move has been reduced to 0. Each loop decremented count, so repeated commands were only repeated half the number of times the player typed. count is now decremented only when ch has been set to the repeated command.

author	John "Elwin" Edwards
date	Thu, 28 May 2015 11:08:03 -0400
parents	3aa87373c908
children	382ff498acdd

rev	line source
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	1 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	2 * Read a scroll and let it happen
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	3 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	4 * @(#)scrolls.c 9.0 (rdk) 7/17/84
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	5 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	6 * Super-Rogue
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	7 * Copyright (C) 1984 Robert D. Kindelberger
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	8 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	9 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	10 * Based on "Rogue: Exploring the Dungeons of Doom"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	12 * All rights reserved.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	13 *
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	14 * See the file LICENSE.TXT for full copyright and licensing information.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	15 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	16
60 3aa87373c908 srogue: include missing headers. elwin parents: 36 diff changeset	17 #include <stdlib.h>
3aa87373c908 srogue: include missing headers. elwin parents: 36 diff changeset	18 #include <string.h>
36 2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	19 #include <ctype.h>
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	20 #include "rogue.h"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	21 #include "rogue.ext"
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	22
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	23 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	24 * read_scroll:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	25 * Let the hero read a scroll
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 read_scroll()
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28 {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 reg struct object *obj;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 reg struct linked_list *item;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31 reg int i, j, wh;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 reg char ch, nch;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 struct room *rp;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 struct linked_list *titem;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 char buf[LINLEN];
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	36 bool bless, curse;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	37
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38 if ((item = get_item("read", SCROLL)) == NULL)
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39 return;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	40 obj = OBJPTR(item);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	41 if (obj->o_type != SCROLL) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	42 msg("Nothing to read.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 after = FALSE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	44 return;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46 msg("As you read the scroll, it vanishes.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47 wh = obj->o_which;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48 bless = o_on(obj, ISBLESS);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 curse = o_on(obj, ISCURSED);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	50 del_pack(item); /* Get rid of the thing */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	51
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	52 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	53 * Calculate the effect it has on the hero
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	54 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	55 switch(wh) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	56 case S_KNOWALL:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	57 if (!curse) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58 idenpack(); /* identify all the pack */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59 msg("You feel more knowledgable.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 chg_abil(WIS,1,TRUE);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 s_know[S_KNOWALL] = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	62 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	63 when S_CONFUSE:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 if (!curse) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66 * Scroll of monster confusion. Give him that power.
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 */
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 msg("Your hands begin to glow red.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 player.t_flags \|= CANHUH;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	70 s_know[S_CONFUSE] = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	71 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	72 when S_LIGHT:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	73 rp = player.t_room;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	74 if (!curse) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75 if (rp == NULL) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76 s_know[S_LIGHT] = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	77 msg("The corridor glows and then fades.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	78 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 else {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80 if (rf_on(rp,ISDARK)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	81 s_know[S_LIGHT] = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	82 msg("The room is lit.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	83 rp->r_flags &= ~ISDARK;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	84 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85 light(&hero);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 mvwaddch(cw, hero.y, hero.x, PLAYER);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 when S_ARMOR:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 if (!curse) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	91 if (cur_armor != NULL && o_off(cur_armor,ISPROT)) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	92 s_know[S_ARMOR] = TRUE;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 msg("Your armor glows faintly for a moment.");
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 if (o_on(cur_armor,ISCURSED))
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95 cur_armor->o_ac = armors[cur_armor->o_which].a_class;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 else
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 cur_armor->o_ac--;
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 resoflg(cur_armor,ISCURSED);
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	100 }
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	101 when S_HOLD:
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	102 if (!curse) {
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	103 /*
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	104 * Hold monster scroll. Stop all monsters within 3 spaces
2128c7dc8a40 Import Super-Rogue 9.0 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	105 * from chasing after the hero.

Mercurial > hg > early-roguelike

annotate srogue/scrolls.c @ 152:0c775afe0072