Early Roguelike Collection: rogue4/move.c annotate

annotate rogue4/move.c @ 215:1b73a8641b37

rogue4: fix most GCC5 warnings. Converting all function definitions to ANSI style accounts for most of the change. This has exposed other problems, such as daemons not actually being their stated type, that will require more careful solutions.

author	John "Elwin" Edwards
date	Wed, 27 Jan 2016 19:41:05 -0500
parents	9535a08ddc39
children

rev	line source
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	1 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	2 * Hero movement commands
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	3 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	4 * @(#)move.c 4.24 (Berkeley) 5/12/82
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	5 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	6 * Rogue: Exploring the Dungeons of Doom
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	7 * Copyright (C) 1980, 1981, 1982 Michael Toy, Ken Arnold and Glenn Wichman
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	8 * All rights reserved.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	9 *
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	10 * See the file LICENSE.TXT for full copyright and licensing information.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	11 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	12
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	13 #include <curses.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include <ctype.h>
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	15 #include "rogue.h"
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	16
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	17 void turnref(void);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	18 char be_trapped(coord *tc);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	19
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	20 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	21 * Used to hold the new hero position
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	22 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	23
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	24 coord nh;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	25
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	26 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	27 * do_run:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	28 * Start the hero running
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	29 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	30 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	31 do_run(char ch)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	32 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	33 running = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 after = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35 runch = ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	36 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	37
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 * do_move:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 * Check to see that a move is legal. If it is handle the
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 * consequences (fighting, picking up, etc.)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	42 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	43 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	44 do_move(int dy, int dx)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 register char ch, fl;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	47
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	48 firstmove = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49 if (no_move)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 no_move--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 msg("you are still stuck in the bear trap");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 * Do a confused move (maybe)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	57 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	58 if (on(player, ISHUH) && rnd(5) != 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	59 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	60 nh = *rndmove(&player);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	61 if (ce(nh, hero))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	62 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	63 after = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	67 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	68 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 over:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 nh.y = hero.y + dy;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 nh.x = hero.x + dx;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	75 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	76 * Check if he tried to move off the screen or make an illegal
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 * diagonal move, and stop him if he did.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	78 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	79 if (nh.x < 0 \|\| nh.x > COLS-1 \|\| nh.y < 1 \|\| nh.y > LINES - 2)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 goto hit_bound;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 if (!diag_ok(&hero, &nh))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	82 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 after = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	84 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 if (running && ce(hero, nh))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 after = running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89 fl = flat(nh.y, nh.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 ch = winat(nh.y, nh.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 if (!(fl & F_REAL) && ch == FLOOR)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 chat(nh.y, nh.x) = ch = TRAP;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	94 flat(nh.y, nh.x) \|= F_REAL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	95 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 if (on(player, ISHELD) && ch != 'F')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	98 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	99 msg("you are being held");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	100 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	101 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	102 switch (ch)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 case ' ':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	105 case '\|':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	106 case '-':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 hit_bound:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 if (passgo && running && (proom->r_flags & ISGONE)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109 && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	110 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	111 register bool b1, b2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 switch (runch)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 case 'h':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	116 case 'l':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	117 b1 = (((flat(hero.y - 1, hero.x) & F_PASS) \|\| chat(hero.y - 1, hero.x) == DOOR) && hero.y != 1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 b2 = (((flat(hero.y + 1, hero.x) & F_PASS) \|\| chat(hero.y + 1, hero.x) == DOOR) && hero.y != LINES - 2);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 if (!(b1 ^ b2))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 if (b1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 runch = 'k';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 dy = -1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	127 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	128 runch = 'j';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 dy = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	130 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	131 dx = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	132 turnref();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	133 goto over;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	134 case 'j':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	135 case 'k':
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	136 b1 = (((flat(hero.y, hero.x - 1) & F_PASS) \|\| chat(hero.y, hero.x - 1) == DOOR) && hero.x != 0);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 b2 = (((flat(hero.y, hero.x + 1) & F_PASS) \|\| chat(hero.y, hero.x + 1) == DOOR) && hero.x != COLS - 1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 if (!(b1 ^ b2))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	139 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	140 if (b1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 runch = 'h';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 dx = -1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	144 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	145 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	146 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	147 runch = 'l';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 dx = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 dy = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	151 turnref();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 goto over;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	154 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	155 after = running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	156 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 case DOOR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 if (flat(hero.y, hero.x) & F_PASS)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 enter_room(&nh);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	161 goto move_stuff;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	162 case TRAP:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 ch = be_trapped(&nh);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164 if (ch == T_DOOR \|\| ch == T_TELEP)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 goto move_stuff;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 case PASSAGE:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 goto move_stuff;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	169 case FLOOR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	170 if (!(fl & F_REAL))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 be_trapped(&hero);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	172 goto move_stuff;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 default:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 if (isupper(ch) \|\| moat(nh.y, nh.x))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 fight(&nh, ch, cur_weapon, FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 if (ch != STAIRS)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 take = ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	182 move_stuff:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 mvaddch(hero.y, hero.x, chat(hero.y, hero.x));
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 if ((fl & F_PASS) && chat(oldpos.y, oldpos.x) == DOOR)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 leave_room(&nh);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 hero = nh;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	187 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	188 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	189 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	190
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	191 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 * turnref:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 * Decide whether to refresh at a passage turning or not
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	194 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	195 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	196 turnref(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198 register int index;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 index = INDEX(hero.y, hero.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 if (!(_flags[index] & F_SEEN))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 if (jump)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 leaveok(stdscr, TRUE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 refresh();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 leaveok(stdscr, FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 _flags[index] \|= F_SEEN;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	211 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	212
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	213 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	214 * door_open:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	215 * Called to illuminate a room. If it is dark, remove anything
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	216 * that might move.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	217 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	218 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	219 door_open(struct room *rp)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	220 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	221 register int j, k;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	222 register char ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	223 register THING *item;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	224
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	225 if (!(rp->r_flags & ISGONE) && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	226 for (j = rp->r_pos.y; j < rp->r_pos.y + rp->r_max.y; j++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	227 for (k = rp->r_pos.x; k < rp->r_pos.x + rp->r_max.x; k++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	228 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	229 ch = winat(j, k);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	230 move(j, k);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	231 if (isupper(ch))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	232 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	233 item = wake_monster(j, k);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	234 if (item->t_oldch == ' ' && !(rp->r_flags & ISDARK)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	235 && !on(player, ISBLIND))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	236 item->t_oldch = chat(j, k);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	237 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	238 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	239 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	240
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	241 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	242 * be_trapped:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	243 * The guy stepped on a trap.... Make him pay.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	244 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	245 char
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	246 be_trapped(coord *tc)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	247 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	248 register char tr;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	249 register int index;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	250
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	251 count = running = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	252 index = INDEX(tc->y, tc->x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	253 _level[index] = TRAP;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	254 tr = _flags[index] & F_TMASK;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	255 switch (tr)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	256 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	257 case T_DOOR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	258 level++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	259 new_level();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	260 msg("you fell into a trap!");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	261 when T_BEAR:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	262 no_move += BEARTIME;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	263 msg("you are caught in a bear trap");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	264 when T_SLEEP:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	265 no_command += SLEEPTIME;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	266 player.t_flags &= ~ISRUN;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	267 msg("a strange white mist envelops you and you fall asleep");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	268 when T_ARROW:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	269 if (swing(pstats.s_lvl-1, pstats.s_arm, 1))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	270 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	271 pstats.s_hpt -= roll(1, 6);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	272 if (pstats.s_hpt <= 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	273 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	274 msg("an arrow killed you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	275 death('a');
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	276 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	277 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	278 msg("oh no! An arrow shot you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	279 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	280 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	281 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	282 register THING *arrow;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	283
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	284 arrow = new_item();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	285 arrow->o_type = WEAPON;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	286 arrow->o_which = ARROW;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	287 init_weapon(arrow, ARROW);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	288 arrow->o_count = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	289 arrow->o_pos = hero;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	290 arrow->o_hplus = arrow->o_dplus = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	291 fall(arrow, FALSE);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	292 msg("an arrow shoots past you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	293 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	294 when T_TELEP:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	295 teleport();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	296 mvaddch(tc->y, tc->x, TRAP); /* since the hero's leaving, look()
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	297 won't put it on for us */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	298 when T_DART:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	299 if (swing(pstats.s_lvl+1, pstats.s_arm, 1))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	300 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	301 pstats.s_hpt -= roll(1, 4);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	302 if (pstats.s_hpt <= 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	303 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	304 msg("a poisoned dart killed you");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	305 death('d');
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	306 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	307 if (!ISWEARING(R_SUSTSTR) && !save(VS_POISON))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	308 chg_str(-1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	309 msg("a small dart just hit you in the shoulder");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	310 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	311 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	312 msg("a small dart whizzes by your ear and vanishes");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	313 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	314 flush_type();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	315 return tr;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	316 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	317
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	318 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	319 * rndmove:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	320 * Move in a random direction if the monster/person is confused
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	321 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	322 coord *
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	323 rndmove(THING *who)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	324 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	325 register int x, y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	326 register char ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	327 register THING *obj;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	328 static coord ret; /* what we will be returning */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	329
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	330 y = ret.y = who->t_pos.y + rnd(3) - 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	331 x = ret.x = who->t_pos.x + rnd(3) - 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	332 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	333 * Now check to see if that's a legal move. If not, don't move.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	334 * (I.e., bump into the wall or whatever)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	335 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	336 if (y == who->t_pos.y && x == who->t_pos.x)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	337 return &ret;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	338 if ((y < 0 \|\| y >= LINES - 1) \|\| (x < 0 \|\| x >= COLS))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	339 goto bad;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	340 else if (!diag_ok(&who->t_pos, &ret))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	341 goto bad;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	342 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	343 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	344 ch = winat(y, x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	345 if (!step_ok(ch))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	346 goto bad;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	347 if (ch == SCROLL)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	348 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	349 for (obj = lvl_obj; obj != NULL; obj = next(obj))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	350 if (y == obj->o_pos.y && x == obj->o_pos.x)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	351 break;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	352 if (obj != NULL && obj->o_which == S_SCARE)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	353 goto bad;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	354 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	355 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	356 return &ret;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	357
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	358 bad:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	359 ret = who->t_pos;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	360 return &ret;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	361 }

Mercurial > hg > early-roguelike

annotate rogue4/move.c @ 215:1b73a8641b37