Early Roguelike Collection: rogue3/passages.c annotate

annotate rogue3/passages.c @ 239:837044d2c362

Merge the GCC5 and build fix branches. This fixes all warnings produced by GCC 5, except the ones related to system functions. Those could be fixed by including the proper headers, but it would be better to replace the system-dependent code with functions from mdport.c.

author	John "Elwin" Edwards
date	Fri, 11 Mar 2016 19:47:52 -0500
parents	d9e44e18eeec
children	e52a8a7ad4c5

rev	line source
0 527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	1 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	2 * Draw the connecting passages
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	3 *
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	4 * @(#)passages.c 3.4 (Berkeley) 6/15/81
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	5 *
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	6 * Rogue: Exploring the Dungeons of Doom
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	7 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	8 * All rights reserved.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	9 *
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	10 * See the file LICENSE.TXT for full copyright and licensing information.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	11 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	12
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	13 #include <stdlib.h>
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	14 #include "curses.h"
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	15 #include "rogue.h"
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	16
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	17 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	18 * do_passages:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	19 * Draw all the passages on a level.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	20 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	21
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	22 void
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	23 do_passages()
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	24 {
180 d9e44e18eeec rogue3: initialize various pointers. John "Elwin" Edwards parents: 0 diff changeset	25 struct rdes r1, r2 = NULL;
0 527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	26 int i, j;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	27 int roomcount;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	28 static struct rdes
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	29 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	30 bool conn[MAXROOMS]; /* possible to connect to room i? */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	31 bool isconn[MAXROOMS]; /* connection been made to room i? */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	32 bool ingraph; /* this room in graph already? */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	33 } rdes[MAXROOMS] = {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	34 { { 0, 1, 0, 1, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	35 { { 1, 0, 1, 0, 1, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	36 { { 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	37 { { 1, 0, 0, 0, 1, 0, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	38 { { 0, 1, 0, 1, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	39 { { 0, 0, 1, 0, 1, 0, 0, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	40 { { 0, 0, 0, 1, 0, 0, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	41 { { 0, 0, 0, 0, 1, 0, 1, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	42 { { 0, 0, 0, 0, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	43 };
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	44
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	45 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	46 * reinitialize room graph description
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	47 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	48 for (r1 = rdes; r1 <= &rdes[MAXROOMS-1]; r1++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	49 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	50 for (j = 0; j < MAXROOMS; j++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	51 r1->isconn[j] = FALSE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	52 r1->ingraph = FALSE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	53 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	54
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	55 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	56 * starting with one room, connect it to a random adjacent room and
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	57 * then pick a new room to start with.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	58 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	59 roomcount = 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	60 r1 = &rdes[rnd(MAXROOMS)];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	61 r1->ingraph = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	62 do
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	63 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	64 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	65 * find a room to connect with
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	66 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	67 j = 0;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	68 for (i = 0; i < MAXROOMS; i++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	69 if (r1->conn[i] && !rdes[i].ingraph && rnd(++j) == 0)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	70 r2 = &rdes[i];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	71 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	72 * if no adjacent rooms are outside the graph, pick a new room
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	73 * to look from
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	74 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	75 if (j == 0)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	76 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	77 do
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	78 r1 = &rdes[rnd(MAXROOMS)];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	79 until (r1->ingraph);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	80 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	81 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	82 * otherwise, connect new room to the graph, and draw a tunnel
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	83 * to it
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	84 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	85 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	86 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	87 r2->ingraph = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	88 i = (int)(r1 - rdes);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	89 j = (int)(r2 - rdes);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	90 conn(i, j);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	91 r1->isconn[j] = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	92 r2->isconn[i] = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	93 roomcount++;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	94 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	95 } while (roomcount < MAXROOMS);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	96
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	97 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	98 * attempt to add passages to the graph a random number of times so
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	99 * that there isn't just one unique passage through it.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	100 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	101 for (roomcount = rnd(5); roomcount > 0; roomcount--)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	102 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	103 r1 = &rdes[rnd(MAXROOMS)]; /* a random room to look from */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	104 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	105 * find an adjacent room not already connected
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	106 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	107 j = 0;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	108 for (i = 0; i < MAXROOMS; i++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	109 if (r1->conn[i] && !r1->isconn[i] && rnd(++j) == 0)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	110 r2 = &rdes[i];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	111 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	112 * if there is one, connect it and look for the next added
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	113 * passage
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	114 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	115 if (j != 0)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	116 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	117 i = (int)(r1 - rdes);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	118 j = (int)(r2 - rdes);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	119 conn(i, j);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	120 r1->isconn[j] = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	121 r2->isconn[i] = TRUE;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	122 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	123 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	124 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	125
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	126 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	127 * conn:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	128 * Draw a corridor from a room in a certain direction.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	129 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	130
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	131 void
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	132 conn(int r1, int r2)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	133 {
180 d9e44e18eeec rogue3: initialize various pointers. John "Elwin" Edwards parents: 0 diff changeset	134 struct room rpf, rpt = NULL;
0 527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	135 int rmt;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	136 int distance, turn_spot, turn_distance;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	137 int rm;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	138 int direc;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	139 coord pdelta, curr, turn_delta, spos, epos;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	140
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	141 if (r1 < r2)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	142 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	143 rm = r1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	144 if (r1 + 1 == r2)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	145 direc = 'r';
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	146 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	147 direc = 'd';
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	148 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	149 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	150 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	151 rm = r2;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	152 if (r2 + 1 == r1)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	153 direc = 'r';
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	154 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	155 direc = 'd';
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	156 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	157 rpf = &rooms[rm];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	158 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	159 * Set up the movement variables, in two cases:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	160 * first drawing one down.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	161 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	162 if (direc == 'd')
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	163 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	164 rmt = rm + 3; /* room # of dest */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	165 rpt = &rooms[rmt]; /* room pointer of dest */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	166 pdelta.x = 0; /* direction of move */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	167 pdelta.y = 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	168 spos.x = rpf->r_pos.x; /* start of move */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	169 spos.y = rpf->r_pos.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	170 epos.x = rpt->r_pos.x; /* end of move */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	171 epos.y = rpt->r_pos.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	172 if (!(rpf->r_flags & ISGONE)) /* if not gone pick door pos */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	173 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	174 spos.x += rnd(rpf->r_max.x-2)+1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	175 spos.y += rpf->r_max.y-1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	176 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	177 if (!(rpt->r_flags & ISGONE))
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	178 epos.x += rnd(rpt->r_max.x-2)+1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	179 distance = abs(spos.y - epos.y) - 1; /* distance to move */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	180 turn_delta.y = 0; /* direction to turn */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	181 turn_delta.x = (spos.x < epos.x ? 1 : -1);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	182 turn_distance = abs(spos.x - epos.x); /* how far to turn */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	183 turn_spot = rnd(distance-1) + 1; /* where turn starts */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	184 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	185 else if (direc == 'r') /* setup for moving right */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	186 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	187 rmt = rm + 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	188 rpt = &rooms[rmt];
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	189 pdelta.x = 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	190 pdelta.y = 0;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	191 spos.x = rpf->r_pos.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	192 spos.y = rpf->r_pos.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	193 epos.x = rpt->r_pos.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	194 epos.y = rpt->r_pos.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	195 if (!(rpf->r_flags & ISGONE))
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	196 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	197 spos.x += rpf->r_max.x-1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	198 spos.y += rnd(rpf->r_max.y-2)+1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	199 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	200 if (!(rpt->r_flags & ISGONE))
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	201 epos.y += rnd(rpt->r_max.y-2)+1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	202 distance = abs(spos.x - epos.x) - 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	203 turn_delta.y = (spos.y < epos.y ? 1 : -1);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	204 turn_delta.x = 0;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	205 turn_distance = abs(spos.y - epos.y);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	206 turn_spot = rnd(distance-1) + 1;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	207 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	208 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	209 fatal("error in connection tables");
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	210 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	211 * Draw in the doors on either side of the passage or just put #'s
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	212 * if the rooms are gone.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	213 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	214 if (!(rpf->r_flags & ISGONE)) door(rpf, &spos);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	215 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	216 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	217 cmov(spos);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	218 addch('#');
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	219 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	220 if (!(rpt->r_flags & ISGONE)) door(rpt, &epos);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	221 else
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	222 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	223 cmov(epos);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	224 addch('#');
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	225 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	226 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	227 * Get ready to move...
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	228 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	229 curr.x = spos.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	230 curr.y = spos.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	231 while(distance)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	232 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	233 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	234 * Move to new position
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	235 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	236 curr.x += pdelta.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	237 curr.y += pdelta.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	238 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	239 * Check if we are at the turn place, if so do the turn
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	240 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	241 if (distance == turn_spot && turn_distance > 0)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	242 while(turn_distance--)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	243 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	244 cmov(curr);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	245 addch(PASSAGE);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	246 curr.x += turn_delta.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	247 curr.y += turn_delta.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	248 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	249 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	250 * Continue digging along
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	251 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	252 cmov(curr);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	253 addch(PASSAGE);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	254 distance--;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	255 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	256 curr.x += pdelta.x;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	257 curr.y += pdelta.y;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	258 if (!ce(curr, epos))
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	259 msg("Warning, connectivity problem on this level.");
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	260 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	261
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	262 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	263 * Add a door or possibly a secret door
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	264 * also enters the door in the exits array of the room.
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	265 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	266
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	267 void
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	268 door(struct room rm, coord cp)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	269 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	270 cmov(*cp);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	271 addch( (rnd(10) < level - 1 && rnd(100) < 20 ? SECRETDOOR : DOOR) );
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	272 rm->r_exit[rm->r_nexits++] = *cp;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	273 }
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	274
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	275 /*
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	276 * add_pass:
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	277 * add the passages to the current window (wizard command)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	278 */
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	279
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	280 void
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	281 add_pass()
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	282 {
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	283 int y, x, ch;
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	284
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	285 for (y = 1; y < LINES - 2; y++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	286 for (x = 0; x < COLS; x++)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	287 if ((ch=mvinch(y, x)) == PASSAGE \|\| ch == DOOR \|\| ch == SECRETDOOR)
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	288 mvwaddch(cw, y, x, ch);
527e2150eaf0 Import Rogue 3.6 from the Roguelike Restoration Project (r1490) edwarj4 parents: diff changeset	289 }

Mercurial > hg > early-roguelike

annotate rogue3/passages.c @ 239:837044d2c362