Early Roguelike Collection: arogue5/passages.c annotate

annotate arogue5/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	56e748983fa8
children

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

Mercurial > hg > early-roguelike

annotate arogue5/passages.c @ 304:e52a8a7ad4c5