Early Roguelike Collection: rogue4/passages.c annotate

annotate rogue4/passages.c @ 317:aab761616489 default tip

Rearrange some Autoconf files. Autoconf was failing to detect install-sh at the top level and needed some explicit directions. It also wants config.guess and config.sub to be provided too. A few other macros have also been updated.

author	John "Elwin" Edwards
date	Tue, 05 Sep 2023 20:05:24 -0400
parents	3900f3cfe07d
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 * Draw the connecting passages
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 * @(#)passages.c 4.8 (Berkeley) 1/27/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
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	13 #include <stdlib.h>
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include <curses.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 conn(int r1, int r2);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	18 void door(struct room rm, coord cp);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	19 void passnum(void);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	20 void numpass(int y, int x);
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	21
12 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 * do_passages:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	24 * Draw all the passages on a level.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	25 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	26 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	27 do_passages(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	28 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	29 register struct rdes r1, r2 = NULL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	30 register int i, j;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	31 register int roomcount;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	32 static struct rdes
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	33 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 bool conn[MAXROOMS]; /* possible to connect to room i? */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35 bool isconn[MAXROOMS]; /* connection been made to room i? */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	36 bool ingraph; /* this room in graph already? */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	37 } rdes[MAXROOMS] = {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 { { 0, 1, 0, 1, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 { { 1, 0, 1, 0, 1, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 { { 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 { { 1, 0, 0, 0, 1, 0, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	42 { { 0, 1, 0, 1, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	43 { { 0, 0, 1, 0, 1, 0, 0, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	44 { { 0, 0, 0, 1, 0, 0, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 { { 0, 0, 0, 0, 1, 0, 1, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 { { 0, 0, 0, 0, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
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
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 * reinitialize room graph description
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 for (r1 = rdes; r1 <= &rdes[MAXROOMS-1]; r1++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54 for (j = 0; j < MAXROOMS; j++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 r1->isconn[j] = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 r1->ingraph = FALSE;
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
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 * starting with one room, connect it to a random adjacent room and
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	61 * then pick a new room to start with.
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 roomcount = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 r1 = &rdes[rnd(MAXROOMS)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 r1->ingraph = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 do
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 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 * find a room to connect with
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 j = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 for (i = 0; i < MAXROOMS; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 if (r1->conn[i] && !rdes[i].ingraph && rnd(++j) == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74 r2 = &rdes[i];
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 * if no adjacent rooms are outside the graph, pick a new room
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 * to look from
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 (j == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 do
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	82 r1 = &rdes[rnd(MAXROOMS)];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 until (r1->ingraph);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	84 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 * otherwise, connect new room to the graph, and draw a tunnel
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 * to it
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 r2->ingraph = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 i = r1 - rdes;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 j = r2 - rdes;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	94 conn(i, j);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	95 r1->isconn[j] = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96 r2->isconn[i] = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 roomcount++;
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 } while (roomcount < MAXROOMS);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	100
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 * attempt to add passages to the graph a random number of times so
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 * that there isn't always just one unique passage through it.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	105 for (roomcount = rnd(5); roomcount > 0; roomcount--)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	106 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 r1 = &rdes[rnd(MAXROOMS)]; /* a random room to look from */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109 * find an adjacent room not already connected
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 j = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112 for (i = 0; i < MAXROOMS; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 if (r1->conn[i] && !r1->isconn[i] && rnd(++j) == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 r2 = &rdes[i];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	116 * if there is one, connect it and look for the next added
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	117 * passage
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 if (j != 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 i = r1 - rdes;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 j = r2 - rdes;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 conn(i, j);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 r1->isconn[j] = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125 r2->isconn[i] = TRUE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 }
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 passnum();
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 }
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 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	132 * conn:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	133 * Draw a corridor from a room in a certain direction.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	134 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	135 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	136 conn(int r1, int r2)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 register struct room rpf, rpt = NULL;
300 0250220d8cdd Fix an assortment of compiler warnings. John "Elwin" Edwards parents: 215 diff changeset	139 unsigned char rmt;
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	140 register int distance = 0, turn_spot = 0, turn_distance = 0, index;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 register int rm;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 register char direc;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 coord del = {0,0}, curr, turn_delta = {0,0}, spos = {0,0}, epos = {0,0};
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 if (r1 < r2)
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 rm = r1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 if (r1 + 1 == r2)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 direc = 'r';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	151 direc = 'd';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 else
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 rm = r2;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	156 if (r2 + 1 == r1)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 direc = 'r';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 direc = 'd';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	161 rpf = &rooms[rm];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	162 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 * Set up the movement variables, in two cases:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164 * first drawing one down.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 if (direc == 'd')
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 rmt = rm + 3; /* room # of dest */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	169 rpt = &rooms[rmt]; /* room pointer of dest */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	170 del.x = 0; /* direction of move */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 del.y = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	172 spos.x = rpf->r_pos.x; /* start of move */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 spos.y = rpf->r_pos.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174 epos.x = rpt->r_pos.x; /* end of move */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 epos.y = rpt->r_pos.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 if (!(rpf->r_flags & ISGONE)) /* if not gone pick door pos */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 spos.x += rnd(rpf->r_max.x - 2) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 spos.y += rpf->r_max.y - 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 if (!(rpt->r_flags & ISGONE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	182 epos.x += rnd(rpt->r_max.x - 2) + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 distance = abs(spos.y - epos.y) - 1; /* distance to move */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 turn_delta.y = 0; /* direction to turn */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 turn_delta.x = (spos.x < epos.x ? 1 : -1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 turn_distance = abs(spos.x - epos.x); /* how far to turn */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	187 turn_spot = rnd(distance-1) + 1; /* where turn starts */
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 else if (direc == 'r') /* setup for moving right */
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 rmt = rm + 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 rpt = &rooms[rmt];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 del.x = 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	194 del.y = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	195 spos.x = rpf->r_pos.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	196 spos.y = rpf->r_pos.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197 epos.x = rpt->r_pos.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198 epos.y = rpt->r_pos.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199 if (!(rpf->r_flags & ISGONE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 spos.x += rpf->r_max.x-1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 spos.y += rnd(rpf->r_max.y-2)+1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 if (!(rpt->r_flags & ISGONE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 epos.y += rnd(rpt->r_max.y-2)+1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 distance = abs(spos.x - epos.x) - 1;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 turn_delta.y = (spos.y < epos.y ? 1 : -1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 turn_delta.x = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 turn_distance = abs(spos.y - epos.y);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 turn_spot = rnd(distance-1) + 1;
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 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	213 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	214 debug("error in connection tables");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	215 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	216 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	217 * Draw in the doors on either side of the passage or just put #'s
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	218 * if the rooms are gone.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	219 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	220 if (!(rpf->r_flags & ISGONE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	221 door(rpf, &spos);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	222 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	223 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	224 index = INDEX(spos.y, spos.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	225 _level[index] = PASSAGE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	226 _flags[index] \|= F_PASS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	227 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	228 if (!(rpt->r_flags & ISGONE))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	229 door(rpt, &epos);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	230 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	231 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	232 index = INDEX(epos.y, epos.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	233 _level[index] = PASSAGE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	234 _flags[index] \|= F_PASS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	235 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	236 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	237 * Get ready to move...
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 curr.x = spos.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	240 curr.y = spos.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	241 while (distance)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	242 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	243 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	244 * Move to new position
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	245 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	246 curr.x += del.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	247 curr.y += del.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	248 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	249 * Check if we are at the turn place, if so do the turn
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 if (distance == turn_spot)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	252 while (turn_distance--)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	253 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	254 index = INDEX(curr.y, curr.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	255 _level[index] = PASSAGE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	256 _flags[index] \|= F_PASS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	257 curr.x += turn_delta.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	258 curr.y += turn_delta.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	259 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	260 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	261 * Continue digging along
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	262 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	263 index = INDEX(curr.y, curr.x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	264 _level[index] = PASSAGE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	265 _flags[index] \|= F_PASS;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	266 distance--;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	267 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	268 curr.x += del.x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	269 curr.y += del.y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	270 if (!ce(curr, epos))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	271 msg("warning, connectivity problem on this level");
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	272 }
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 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	275 * door:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	276 * Add a door or possibly a secret door. Also enters the door in
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	277 * the exits array of the room.
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	278 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	279 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	280 door(struct room rm, coord cp)
12 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 int index;
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 index = INDEX(cp->y, cp->x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	285 if (rnd(10) + 1 < level && rnd(5) == 0)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	286 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	287 _level[index] = (cp->y == rm->r_pos.y \|\| cp->y == rm->r_pos.y + rm->r_max.y - 1) ? '-' : '\|';
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	288 _flags[index] &= ~F_REAL;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	289 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	290 else
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	291 _level[index] = DOOR;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	292 rm->r_exit[rm->r_nexits++] = *cp;
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
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	295 #ifdef WIZARD
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	296 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	297 * add_pass:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	298 * Add the passages to the current window (wizard command)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	299 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	300 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	301 add_pass(void)
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	302 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	303 register int y, x, ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	304
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	305 for (y = 1; y < LINES - 1; y++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	306 for (x = 0; x < COLS; x++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	307 if ((ch = chat(y, x)) == DOOR \|\| ch == PASSAGE)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	308 mvaddch(y, x, ch);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	309 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	310 #endif
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	311
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	312 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	313 * passnum:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	314 * Assign a number to each passageway
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	315 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	316 static int pnum;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	317 static bool newpnum;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	318
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	319 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	320 passnum(void)
12 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 register struct room *rp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	323 register int i;
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 pnum = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	326 newpnum = FALSE;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	327 for (rp = passages; rp < &passages[MAXPASS]; rp++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	328 rp->r_nexits = 0;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	329 for (rp = rooms; rp < &rooms[MAXROOMS]; rp++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	330 for (i = 0; i < rp->r_nexits; i++)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	331 {
305 3900f3cfe07d Rogue V4: fix arithmetic operations on boolean variables. John "Elwin" Edwards parents: 300 diff changeset	332 newpnum = TRUE;
12 9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	333 numpass(rp->r_exit[i].y, rp->r_exit[i].x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	334 }
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
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	337 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	338 * numpass:
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	339 * Number a passageway square and its brethren
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	340 */
215 1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	341 void
1b73a8641b37 rogue4: fix most GCC5 warnings. John "Elwin" Edwards parents: 12 diff changeset	342 numpass(int y, int x)
12 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 register char *fp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	345 register struct room *rp;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	346 register char ch;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	347
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	348 fp = &flat(y, x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	349 if (*fp & F_PNUM)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	350 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	351 if (newpnum)
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	352 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	353 pnum++;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	354 newpnum = FALSE;
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 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	357 * check to see if it is a door or secret door, i.e., a new exit,
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	358 * or a numerable type of place
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	359 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	360 if ((ch = chat(y, x)) == DOOR \|\| (!(*fp & F_REAL) && ch != FLOOR))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	361 {
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	362 rp = &passages[pnum];
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	363 rp->r_exit[rp->r_nexits].y = y;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	364 rp->r_exit[rp->r_nexits++].x = x;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	365 }
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	366 else if (!(*fp & F_PASS))
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	367 return;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	368 *fp \|= pnum;
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	369 /*
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	370 * recurse on the surrounding places
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	371 */
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	372 numpass(y + 1, x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	373 numpass(y - 1, x);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	374 numpass(y, x + 1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	375 numpass(y, x - 1);
9535a08ddc39 Import Rogue 5.2 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	376 }

Mercurial > hg > early-roguelike

annotate rogue4/passages.c @ 317:aab761616489 default tip