Early Roguelike Collection: urogue/command.c annotate

annotate urogue/command.c @ 304:e52a8a7ad4c5

Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	4573b355cdc1
children	c03d0b87211c

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 command.c - Read and execute the user commands
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 UltraRogue: The Ultimate Adventure in the Dungeons of Doom
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 Copyright (C) 1985, 1986, 1992, 1993, 1995 Herb Chong
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 Based on "Advanced Rogue"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 Copyright (C) 1984, 1985 Michael Morgan, Ken Dalka
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 All rights reserved.
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 Based on "Rogue: Exploring the Dungeons of Doom"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14 All rights reserved.
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 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	17 */
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 #include <string.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20 #include <stdlib.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include <ctype.h>
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22 #include "rogue.h"
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 /*
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 command()
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 Process the user commands
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 void
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 command(void)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	31 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 static char repcommand; /* Command to repeat if we are repeating */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 static int fight_to_death; /* Flags if we are fighting to death */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 static coord dir; /* Last direction specified */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 276 diff changeset	36 #ifdef WIZARD
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 object *obj;
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 276 diff changeset	38 #endif
256 c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 char ch;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 int ntimes = 1; /* Number of player moves */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 coord nullcoord;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 nullcoord.x = nullcoord.y = 0;
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 if (on(player, CANFLY) && rnd(2))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 ntimes++;
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 if (on(player, ISHASTE))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 ntimes++;
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 if (fighting && att_bonus())
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 ntimes *= 2;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 if (on(player, ISSLOW))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 if (player.t_turn != TRUE)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 ntimes--;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 player.t_turn ^= TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60 }
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 (ntimes == 0)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 return;
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 while (ntimes--)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 moving = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 /* If player is infested, take off a hit point */
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 if (on(player, HASINFEST) && !is_wearing(R_HEALTH))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 {
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 if ((pstats.s_hpt -= infest_dam) <= 0)
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 death(D_INFESTATION);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 return;
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 }
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 look(after);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 if (!running)
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 door_stop = FALSE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 status(FALSE);
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 wmove(cw, hero.y, hero.x);
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 (!((running \|\| count) && jump))
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 wrefresh(cw); /* Draw screen */
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 take = 0;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 after = TRUE;
c495a4f288c6 Import UltraRogue from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents:

Mercurial > hg > early-roguelike

annotate urogue/command.c @ 304:e52a8a7ad4c5