Early Roguelike Collection: arogue7/io.c annotate

annotate arogue7/io.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	b786053d2f37
children	f9ef86cf22b2

rev	line source
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 * io.c - Various input/output functions
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 * Advanced Rogue
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 * Copyright (C) 1984, 1985, 1986 Michael Morgan, Ken Dalka and AT&T
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 * Based on "Rogue: Exploring the Dungeons of Doom"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 * See the file LICENSE.TXT for full copyright and licensing information.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 * Various input/output functions
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19 #include "curses.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <stdarg.h>
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include <ctype.h>
126 b786053d2f37 arogue7: add missing header includes. John "Elwin" Edwards parents: 125 diff changeset	22 #include <string.h>
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 #include "rogue.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 * msg:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 * Display a message at the top of the screen.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 static char msgbuf[BUFSIZ];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 static int newpos = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 /VARARGS1/
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 msg(char *fmt, ...)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 va_list ap;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 * if the string is "", just clear the line
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 if (*fmt == '\0')
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 overwrite(cw,msgw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 wmove(msgw, 0, 0);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 clearok(msgw, FALSE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 draw(msgw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 mpos = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 return;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50 * otherwise add to the message and flush it out
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 va_start(ap,fmt);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 doadd(fmt, ap);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 va_end(ap);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 endmsg();
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 * add things to the current message
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 addmsg(char *fmt, ...)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 va_list ap;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 va_start(ap, fmt);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 doadd(fmt, ap);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 va_end(ap);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 * Display a new msg (giving him a chance to see the previous one if it
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 * is up there with the --More--)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 endmsg()
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 /* Needed to track where we are for 5.0 (PC) curses */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 register int x, y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 strcpy(huh, msgbuf);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 if (mpos) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 * If this message will fit on the line (plus space for --More--
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 * then just add it (only during combat).
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 if (player.t_quiet < 0 && mpos + newpos + strlen(morestr) + 2 < cols) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 wmove(msgw, 0, mpos + 2);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 newpos += mpos + 2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 wmove(msgw, 0, mpos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 waddstr(msgw, morestr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 draw(cw);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	93 draw(msgw);

Mercurial > hg > early-roguelike

annotate arogue7/io.c @ 152:0c775afe0072