Early Roguelike Collection: arogue7/passages.c annotate

annotate arogue7/passages.c @ 304:e52a8a7ad4c5

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

author	John "Elwin" Edwards
date	Wed, 14 Apr 2021 18:55:33 -0400
parents	f9ef86cf22b2
children	13b482bd9e66

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
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	21 #include <stdlib.h>
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	22 #include "curses.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	23 #include "rogue.h"
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	24
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	25 void conn(int r1, int r2);
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	26 void door(struct room rm, coord cp);
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	27
125 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 * 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	31 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	32
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	33 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	34 do_passages(void)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	35 {
200 1cd604c827a3 Advanced Rogue 7: initialize multiple variables. John "Elwin" Edwards parents: 125 diff changeset	36 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	37 register int i, j;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	38 register int roomcount;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	39 static struct rdes
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	40 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	41 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	42 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	43 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	44 } rdes[MAXROOMS] = {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	45 { { 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	46 { { 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	47 { { 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	48 { { 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	49 { { 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	50 { { 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	51 { { 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	52 { { 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	53 { { 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	54 };
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 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	57 * reinitialize room graph description
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	58 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	59 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	60 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	61 for (j = 0; j < MAXROOMS; j++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	62 r1->isconn[j] = FALSE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	63 r1->ingraph = FALSE;
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
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	66 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	67 * 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	68 * 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	69 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	70 roomcount = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	71 r1 = &rdes[rnd(MAXROOMS)];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	72 r1->ingraph = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	73 do
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	74 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	75 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	76 * find a room to connect with
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 j = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	79 for (i = 0; i < MAXROOMS; i++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	80 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	81 r2 = &rdes[i];
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 * 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	84 * to look from
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	85 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	86 if (j == 0)
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 do
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	89 r1 = &rdes[rnd(MAXROOMS)];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	90 until (r1->ingraph);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	91 }
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 * 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	94 * to it
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	95 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	96 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	97 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	98 r2->ingraph = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	99 i = (int)(r1 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	100 j = (int)(r2 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	101 conn(i, j);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	102 r1->isconn[j] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	103 r2->isconn[i] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	104 roomcount++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	105 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	106 } while (roomcount < MAXROOMS);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	107
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 * 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	110 * 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	111 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	112 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	113 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	114 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	115 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	116 * 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	117 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	118 j = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	119 for (i = 0; i < MAXROOMS; i++)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	120 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	121 r2 = &rdes[i];
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 * 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	124 * passage
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	125 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	126 if (j != 0)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	127 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	128 i = (int)(r1 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	129 j = (int)(r2 - rdes);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	130 conn(i, j);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	131 r1->isconn[j] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	132 r2->isconn[i] = TRUE;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	133 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	134 }
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 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	138 * conn:
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	139 * 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	140 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	141
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	142 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	143 conn(int r1, int r2)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	144 {
200 1cd604c827a3 Advanced Rogue 7: initialize multiple variables. John "Elwin" Edwards parents: 125 diff changeset	145 register struct room rpf, rpt = NULL;
304 e52a8a7ad4c5 Fix many compiler warnings. John "Elwin" Edwards parents: 219 diff changeset	146 register signed char rmt;
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	147 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	148 register int rm;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	149 int turns[3], turn_dist[3];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	150 register char direc;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	151 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	152
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	153 if (r1 < r2)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	154 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	155 rm = r1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	156 if (r1 + 1 == r2)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	157 direc = 'r';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	158 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	159 direc = 'd';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	160 }
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 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	163 rm = r2;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	164 if (r2 + 1 == r1)
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	165 direc = 'r';
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	166 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	167 direc = 'd';
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 rpf = &rooms[rm];
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 * 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	172 * first drawing one down.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	173 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	174 if (direc == 'd')
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	175 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	176 rmt = rm + 3; /* room # of dest */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	177 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	178 delta.x = 0; /* direction of move */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	179 delta.y = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	180 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	181 spos.y = rpf->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	182 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	183 epos.y = rpt->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	184 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	185 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	186 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	187 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	188 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	189 if (!(rpt->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	190 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	191 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	192 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	193 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	194 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	195 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	196 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	197 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	198 rmt = rm + 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	199 rpt = &rooms[rmt];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	200 delta.x = 1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	201 delta.y = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	202 spos.x = rpf->r_pos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	203 spos.y = rpf->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	204 epos.x = rpt->r_pos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	205 epos.y = rpt->r_pos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	206 if (!(rpf->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	207 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	208 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	209 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	210 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	211 if (!(rpt->r_flags & ISGONE))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	212 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	213 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	214 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	215 turn_delta.x = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	216 offset = abs(spos.y - epos.y);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	217 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	218 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	219 debug("error in connection tables");
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	220
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	221 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	222 * 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	223 * if the rooms are gone.
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	224 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	225 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	226 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	227 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	228 cmov(spos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	229 addch('#');
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	230 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	231 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	232 else
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	233 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	234 cmov(epos);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	235 addch('#');
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
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	238 /* How far can we move diagonally? */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	239 max_diag = min(distance, offset);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	240
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	241 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	242 * 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	243 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	244 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	245 if (max_diag > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	246 int nturns;
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 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	249 if (rnd(3 - i + nturns) == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	250 nturns++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	251 turns[i] = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	252 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	253 else turns[i] = -1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	254 }
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 else {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	257 /* 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	258 turns[0] = turns[2] = -1;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	259 turns[1] = 0;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	260 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	261
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	262 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	263 * 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	264 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	265 while (max_diag > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	266 for (i=0; i<3; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	267 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	268 turn_dist[i]++;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	269 max_diag--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	270 }
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 }
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 * 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	276 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	277 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	278
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	279 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	280 * 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	281 * 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	282 * the exact position relative to "distance."
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] = 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	285 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	286 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	287 turns[0] - turns[2]);
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 turns[0] = distance - turns[0];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	290 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	291 turns[2] = turns[1] - turns[2];
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	292
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	293 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	294 * Get ready to move...
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	295 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	296 curr.x = spos.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	297 curr.y = spos.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	298 while (distance > 0) {
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 * Move to next row/column
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	301 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	302 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	303 curr.y += delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	304
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 * 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	307 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	308 for (i=0; i<3; i++) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	309 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	310 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	311 * 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	312 * 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	313 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	314 if (i == 1 && rnd(3) == 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	315 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	316 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	317 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	318
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	319 /* Now dig the turn */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	320 while (turn_dist[i]--) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	321 curr.x += turn_delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	322 curr.y += turn_delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	323 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	324 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	325 if (i != 1) { /* A diagonal */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	326 if (--distance > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	327 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	328 curr.y += delta.y;
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 }
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 }
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
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	335 if (distance > 0) {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	336 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	337 * Dig the passage.
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 cmov(curr);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	340 addch(PASSAGE);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	341 distance--;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	342 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	343 }
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	344 curr.x += delta.x;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	345 curr.y += delta.y;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	346 if (!ce(curr, epos))
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	347 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	348 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	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 /*
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	352 * 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	353 * 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	354 */
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	355
219 f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	356 void
f9ef86cf22b2 Advanced Rogue 7: convert to ANSI-style function declarations. John "Elwin" Edwards parents: 200 diff changeset	357 door(struct room rm, coord cp)
125 adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	358 {
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	359 struct linked_list *newroom;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	360 coord *exit;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	361
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	362 cmov(*cp);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	363 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	364
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	365 /* 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	366 newroom = new_item(sizeof(coord));
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	367 exit = DOORPTR(newroom);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	368 exit = cp;
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	369 attach(rm->r_exit, newroom);
adfa37e67084 Import Advanced Rogue 7.7 from the Roguelike Restoration Project (r1490) John "Elwin" Edwards parents: diff changeset	370 }

Mercurial > hg > early-roguelike

annotate arogue7/passages.c @ 304:e52a8a7ad4c5