Early Roguelike Collection: arogue7/passages.c annotate

annotate arogue7/passages.c @ 200:1cd604c827a3

Advanced Rogue 7: initialize multiple variables. MSVC complained that they might be used uninitialized. In some cases, this might have been possible. XRogue already has initializations for all these variables.

author	John "Elwin" Edwards
date	Wed, 12 Aug 2015 15:42:02 -0400
parents	adfa37e67084
children	f9ef86cf22b2

rev	line source
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	1 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	2 * passages.c - Draw the connecting passages
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	3 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	4 * Advanced Rogue
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	5 * Copyright (C) 1984, 1985, 1986 Michael Morgan, Ken Dalka and AT&T
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	6 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	7 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	8 * Based on "Rogue: Exploring the Dungeons of Doom"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	9 * Copyright (C) 1980, 1981 Michael Toy, Ken Arnold and Glenn Wichman
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	10 * All rights reserved.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	11 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	12 * See the file LICENSE.TXT for full copyright and licensing information.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	13 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	14
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	15 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	16 * Draw the connecting passages
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	17 *
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	18 * @(#)passages.c 3.4 (Berkeley) 6/15/81
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	19 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	20
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	21 #include "curses.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22 #include "rogue.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	25 * do_passages:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	26 * Draw all the passages on a level.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	27 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	28
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	29 do_passages()
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	30 {
200 1cd604c827a3 Advanced Rogue 7: initialize multiple variables. John "Elwin" Edwards parents: 125 diff changeset	31 register struct rdes r1, r2 = NULL;
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32 register int i, j;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	33 register int roomcount;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	34 static struct rdes
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	36 bool conn[MAXROOMS]; /* possible to connect to room i? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	37 bool isconn[MAXROOMS]; /* connection been made to room i? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 bool ingraph; /* this room in graph already? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 } rdes[MAXROOMS] = {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 { { 0, 1, 0, 1, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 { { 1, 0, 1, 0, 1, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	42 { { 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	43 { { 1, 0, 0, 0, 1, 0, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	44 { { 0, 1, 0, 1, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 { { 0, 0, 1, 0, 1, 0, 0, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	46 { { 0, 0, 0, 1, 0, 0, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	47 { { 0, 0, 0, 0, 1, 0, 1, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	48 { { 0, 0, 0, 0, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 },
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	49 };
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	50
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	51 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	52 * reinitialize room graph description
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	53 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	54 for (r1 = rdes; r1 <= &rdes[MAXROOMS-1]; r1++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	55 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	56 for (j = 0; j < MAXROOMS; j++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 r1->isconn[j] = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 r1->ingraph = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	60
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 * starting with one room, connect it to a random adjacent room and
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 * then pick a new room to start with.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	64 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	65 roomcount = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 r1 = &rdes[rnd(MAXROOMS)];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 r1->ingraph = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	68 do
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	69 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 * find a room to connect with
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 j = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 for (i = 0; i < MAXROOMS; i++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 if (r1->conn[i] && !rdes[i].ingraph && rnd(++j) == 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 r2 = &rdes[i];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	77 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	78 * if no adjacent rooms are outside the graph, pick a new room
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 * to look from
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	81 if (j == 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	82 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	83 do
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	84 r1 = &rdes[rnd(MAXROOMS)];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 until (r1->ingraph);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	87 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	88 * otherwise, connect new room to the graph, and draw a tunnel
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 * to it
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	92 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	93 r2->ingraph = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	94 i = (int)(r1 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	95 j = (int)(r2 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	96 conn(i, j);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	97 r1->isconn[j] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	98 r2->isconn[i] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	99 roomcount++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	100 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	101 } while (roomcount < MAXROOMS);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	102
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	103 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	104 * attempt to add passages to the graph a random number of times so
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	105 * that there isn't just one unique passage through it.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	106 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	107 for (roomcount = rnd(5); roomcount > 0; roomcount--)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	108 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	109 r1 = &rdes[rnd(MAXROOMS)]; /* a random room to look from */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	110 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	111 * find an adjacent room not already connected
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	112 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	113 j = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	114 for (i = 0; i < MAXROOMS; i++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	115 if (r1->conn[i] && !r1->isconn[i] && rnd(++j) == 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	116 r2 = &rdes[i];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	117 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	118 * if there is one, connect it and look for the next added
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	119 * passage
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	120 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	121 if (j != 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	122 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	123 i = (int)(r1 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	124 j = (int)(r2 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	125 conn(i, j);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	126 r1->isconn[j] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	127 r2->isconn[i] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	128 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	129 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	130 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	131
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	132 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	133 * conn:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	134 * Draw a corridor from a room in a certain direction.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	135 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	136
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	137 conn(r1, r2)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	138 int r1, r2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	139 {
200 1cd604c827a3 Advanced Rogue 7: initialize multiple variables. John "Elwin" Edwards parents: 125 diff changeset	140 register struct room rpf, rpt = NULL;
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	141 register char rmt;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	142 register int distance, max_diag, offset, i;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	143 register int rm;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	144 int turns[3], turn_dist[3];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	145 register char direc;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	146 coord delta, curr, turn_delta, spos, epos;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	147
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	148 if (r1 < r2)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	149 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	150 rm = r1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	151 if (r1 + 1 == r2)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	152 direc = 'r';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	153 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	154 direc = 'd';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	155 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	156 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	157 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	158 rm = r2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	159 if (r2 + 1 == r1)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	160 direc = 'r';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	161 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	162 direc = 'd';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	163 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	164 rpf = &rooms[rm];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	165 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	166 * Set up the movement variables, in two cases:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	167 * first drawing one down.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	168 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	169 if (direc == 'd')
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	170 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	171 rmt = rm + 3; /* room # of dest */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	172 rpt = &rooms[rmt]; /* room pointer of dest */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	173 delta.x = 0; /* direction of move */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	174 delta.y = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	175 spos.x = rpf->r_pos.x; /* start of move */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	176 spos.y = rpf->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	177 epos.x = rpt->r_pos.x; /* end of move */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	178 epos.y = rpt->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	179 if (!(rpf->r_flags & ISGONE)) /* if not gone pick door pos */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	180 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	181 spos.x += rnd(rpf->r_max.x-2)+1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	182 spos.y += rpf->r_max.y-1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	183 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	184 if (!(rpt->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	185 epos.x += rnd(rpt->r_max.x-2)+1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	186 distance = abs(spos.y - epos.y) - 1; /* distance to move */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	187 turn_delta.y = 0; /* direction to turn */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	188 turn_delta.x = (spos.x < epos.x ? 1 : -1);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	189 offset = abs(spos.x - epos.x); /* how far to turn */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	190 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	191 else if (direc == 'r') /* setup for moving right */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	192 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	193 rmt = rm + 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	194 rpt = &rooms[rmt];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	195 delta.x = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	196 delta.y = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	197 spos.x = rpf->r_pos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	198 spos.y = rpf->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	199 epos.x = rpt->r_pos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	200 epos.y = rpt->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	201 if (!(rpf->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	202 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	203 spos.x += rpf->r_max.x-1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	204 spos.y += rnd(rpf->r_max.y-2)+1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	205 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	206 if (!(rpt->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	207 epos.y += rnd(rpt->r_max.y-2)+1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	208 distance = abs(spos.x - epos.x) - 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	209 turn_delta.y = (spos.y < epos.y ? 1 : -1);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	210 turn_delta.x = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	211 offset = abs(spos.y - epos.y);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	212 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	213 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	214 debug("error in connection tables");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	215
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	216 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	217 * Draw in the doors on either side of the passage or just put #'s
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	218 * if the rooms are gone.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	219 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	220 if (!(rpf->r_flags & ISGONE)) door(rpf, &spos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	221 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	222 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	223 cmov(spos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	224 addch('#');
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	225 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	226 if (!(rpt->r_flags & ISGONE)) door(rpt, &epos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	227 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	228 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	229 cmov(epos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	230 addch('#');
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	231 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	232
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	233 /* How far can we move diagonally? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	234 max_diag = min(distance, offset);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	235
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	236 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	237 * Decide how many turns we will have.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	238 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	239 for (i=0; i<3; i++) turn_dist[i] = 0; /* Init distances */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	240 if (max_diag > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	241 int nturns;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	242
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	243 for (i=0, nturns=0; i<3; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	244 if (rnd(3 - i + nturns) == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	245 nturns++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	246 turns[i] = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	247 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	248 else turns[i] = -1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	249 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	250 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	251 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	252 /* Just use a straight line (middle turn) */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	253 turns[0] = turns[2] = -1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	254 turns[1] = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	255 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	256
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	257 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	258 * Now decide how long each turn will be (for those selected above).
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	259 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	260 while (max_diag > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	261 for (i=0; i<3; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	262 if (turns[i] >= 0 && max_diag > 0 && rnd(2) == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	263 turn_dist[i]++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	264 max_diag--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	265 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	266 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	267 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	268
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	269 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	270 * If we have extra offset space, add it to the straight turn.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	271 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	272 if (offset > distance) turn_dist[1] += offset - distance;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	273
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	274 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	275 * Decide where we want to make our turns.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	276 * First calculate the offsets, then use those offsets to calculate
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	277 * the exact position relative to "distance."
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	278 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	279 turns[0] = rnd(distance - turn_dist[0] - turn_dist[2]);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	280 turns[2] = rnd(distance - turn_dist[0] - turn_dist[2] - turns[0]);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	281 turns[1] = rnd(distance - turn_dist[0] - turn_dist[2] -
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	282 turns[0] - turns[2]);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	283
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	284 turns[0] = distance - turns[0];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	285 turns[1] = turns[0] - turn_dist[0] - turns[1];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	286 turns[2] = turns[1] - turns[2];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	287
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	288 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	289 * Get ready to move...
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	290 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	291 curr.x = spos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	292 curr.y = spos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	293 while (distance > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	294 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	295 * Move to next row/column
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	296 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	297 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	298 curr.y += delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	299
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	300 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	301 * Check if we are at a turn place; if so make a turn
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	302 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	303 for (i=0; i<3; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	304 if (distance == turns[i] && turn_dist[i] > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	305 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	306 * If this is the start of a straight path,
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	307 * we might put in a right-angle turn (33% chance).
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	308 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	309 if (i == 1 && rnd(3) == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	310 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	311 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	312 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	313
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	314 /* Now dig the turn */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	315 while (turn_dist[i]--) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	316 curr.x += turn_delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	317 curr.y += turn_delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	318 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	319 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	320 if (i != 1) { /* A diagonal */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	321 if (--distance > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	322 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	323 curr.y += delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	324 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	325 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	326 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	327 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	328 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	329
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	330 if (distance > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	331 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	332 * Dig the passage.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	333 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	334 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	335 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	336 distance--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	337 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	338 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	339 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	340 curr.y += delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	341 if (!ce(curr, epos))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	342 msg("Warning, connectivity problem (%d, %d) to (%d, %d).",
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	343 curr.y, curr.x, epos.y, epos.x);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	344 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	345
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	346 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	347 * Add a door or possibly a secret door
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	348 * also enters the door in the exits array of the room.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	349 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	350
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	351 door(rm, cp)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	352 register struct room *rm;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	353 register coord *cp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	354 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	355 struct linked_list *newroom;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	356 coord *exit;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	357
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	358 cmov(*cp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	359 addch((rnd(10) < level - 1 && rnd(100) < 20) ? SECRETDOOR : DOOR);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	360
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	361 /* Insert the new room into the linked list of rooms */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	362 newroom = new_item(sizeof(coord));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	363 exit = DOORPTR(newroom);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	364 exit = cp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	365 attach(rm->r_exit, newroom);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	366 }

Mercurial > hg > early-roguelike

annotate arogue7/passages.c @ 200:1cd604c827a3