Early Roguelike Collection: arogue5/new

annotate arogue5/new_level.c @ 264:778938a5c21d

UltraRogue: add location for character files. When using the -n option, UltraRogue will look for character files in a single location, similar to save files. The location is chosen by defining CHRDIR in getplay.c, at least until UltraRogue gets integrated with the build systems.

author	John "Elwin" Edwards
date	Sun, 19 Feb 2017 19:47:09 -0500
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 * new_level: Dig and draw a new level
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 * Advanced Rogue
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	5 * 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	6 * All rights reserved.
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	7 *
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	8 * Based on "Rogue: Exploring the Dungeons of Doom"
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	9 * 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	10 * All rights reserved.
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 *
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	12 * 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	13 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	14
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	15 #include "curses.h"
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	16 #include "rogue.h"
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	17 #define TERRASAVE 3
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	18
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	19 void put_things(LEVTYPE ltype);
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	20
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	21 /* ltype designates type of level to create */
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	22 void
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	23 new_level(LEVTYPE ltype)
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 register int rm = 0, i, cnt;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26 register char ch;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 register struct linked_list *item;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28 register struct thing *tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 register struct object *obj;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 int waslit = 0; /* Was the previous outside level lit? */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31 int starty = 0, startx = 0, deltay = 0, deltax = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 bool fresh=TRUE, vert = 0, top;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 struct room *rp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 struct linked_list nitem, savmonst=NULL, *savitems=NULL;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 coord stairs = { 0, 0 };
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 if (wizard) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38 msg("Turns: %d", turns); /* Number of turns for last level */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39 mpos = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	40 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	41
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	42 /* Start player off right */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 turn_off(player, ISHELD);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	44 turn_off(player, ISFLEE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45 extinguish(suffocate);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46 hold_count = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47 trap_tries = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 /* Are we just entering a dungeon? If so, how big is it? */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	50 if (ltype != OUTSIDE && nfloors < 0) nfloors = HARDER+10 + rnd(11);
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 if (level > max_level)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	53 max_level = level;
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 /* Are we starting a new outside level? */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	56 if (ltype == OUTSIDE) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	57 register int i, j;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59 /* Save some information prior to clearing the screen */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 if (level == -1 \|\| mvinch(hero.y, hero.x) == '-') vert = TRUE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 else vert = FALSE;
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 if (level == -1) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 fresh = TRUE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 starty = 2;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66 startx = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 deltay = deltax = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 level = 0; /* Restore the level */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	70 else { /* Copy several lines of the terrain to the other end */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	71 char cch; /* Copy character */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	72
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	73 /* Was the area dark (not magically lit)? */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	74 if (!(rooms[0].r_flags & ISDARK)) waslit = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76 fresh = FALSE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	77 if ((vert && hero.y == 1) \|\| (!vert && hero.x == 0)) top = TRUE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	78 else top = FALSE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 for (i=0; i<TERRASAVE; i++) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80 if (vert)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	81 for (j=1; j<COLS-1; j++) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	82 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	83 cch = CCHAR( mvinch(i+2, j) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	84 mvaddch(LINES-6+i, j, cch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 cch = CCHAR( mvinch(LINES-4-i, j) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 mvaddch(4-i, j, cch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	91 else
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	92 for (j=2; j<LINES-3; j++) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 cch = CCHAR( mvinch(j, i+1) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95 mvaddch(j, COLS-4+i, cch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 cch = CCHAR( mvinch(j, COLS-2-i) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 mvaddch(j, 3-i, cch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	100 }
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 }
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 if (vert) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	105 startx = deltax = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	106 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	107 starty = LINES-4-TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	108 deltay = -1;
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 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	111 starty = TERRASAVE + 2;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	112 deltay = 1;
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 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	115 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	116 starty = 2;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	117 deltay = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	118 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	119 startx = COLS-2-TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	120 deltax = -1;
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 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	123 deltax = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	124 startx = TERRASAVE + 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	125 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	126 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	127
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	128 /* Check if any monsters should be saved */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	129 for (item = mlist; item != NULL; item = nitem) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	130 nitem = next(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	131 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	132 if (vert) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	133 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	134 if (tp->t_pos.y < TERRASAVE + 2)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	135 tp->t_pos.y += LINES - 5 - TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	136 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	137 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	138 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	139 if (tp->t_pos.y > LINES - 4 - TERRASAVE)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	140 tp->t_pos.y += 5 + TERRASAVE - LINES;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	141 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	142 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	143 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	144 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	145 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	146 if (tp->t_pos.x < TERRASAVE + 1)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	147 tp->t_pos.x += COLS - 2 - TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	148 else continue;
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 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	151 if (tp->t_pos.x > COLS - 2 - TERRASAVE)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	152 tp->t_pos.x += 2 + TERRASAVE - COLS;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	153 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	154 }
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 detach(mlist, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	157 attach(savmonst, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	158 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	159
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	160 /* Check if any treasure should be saved */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	161 for (item = lvl_obj; item != NULL; item = nitem) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	162 nitem = next(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	163 obj = OBJPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	164 if (vert) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	165 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	166 if (obj->o_pos.y < TERRASAVE + 2)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	167 obj->o_pos.y += LINES - 5 - TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	168 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	169 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	170 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	171 if (obj->o_pos.y > LINES - 4 - TERRASAVE)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	172 obj->o_pos.y += 5 + TERRASAVE - LINES;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	173 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	174 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	175 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	176 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	177 if (top) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	178 if (obj->o_pos.x < TERRASAVE + 1)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	179 obj->o_pos.x += COLS - 2 - TERRASAVE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	180 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	181 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	182 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	183 if (obj->o_pos.x > COLS - 2 - TERRASAVE)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	184 obj->o_pos.x += 2 + TERRASAVE - COLS;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	185 else continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	186 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	187 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	188 detach(lvl_obj, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	189 attach(savitems, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	190 }
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 }
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
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	195 wclear(cw);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	196 wclear(mw);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	197 if (fresh) clear();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	198 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	199 * check to see if he missed a UNIQUE, If he did then put it back
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	200 * in the monster table for next time
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	201 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	202 for (item = mlist; item != NULL; item = next(item)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	203 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	204 if (on(*tp, ISUNIQUE))
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	205 monsters[tp->t_index].m_normal = TRUE;
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 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	208 * Free up the monsters on the last level
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	209 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	210 t_free_list(monst_dead);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	211 t_free_list(mlist);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	212 o_free_list(lvl_obj); /* Free up previous objects (if any) */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	213 for (rp = rooms; rp < &rooms[MAXROOMS]; rp++)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	214 t_free_list(rp->r_exit); /* Free up the exit lists */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	215
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	216 levtype = ltype;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	217 foods_this_level = 0; /* food for hero this level */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	218 if (ltype == POSTLEV) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	219 do_post(); /* do post stuff */
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 else if (ltype == MAZELEV) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	222 do_maze();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	223 no_food++;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	224 put_things(ltype); /* Place objects (if any) */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	225 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	226 else if (ltype == OUTSIDE) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	227 init_terrain();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	228 do_terrain(starty, startx, deltay, deltax, (bool) (fresh \|\| !vert));
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	229 no_food++;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	230 put_things(ltype);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	231
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	232 /* Should we magically light this area? */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	233 if (waslit) rooms[0].r_flags &= ~ISDARK;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	234 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	235 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	236 do_rooms(); /* Draw rooms */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	237 do_passages(); /* Draw passages */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	238 no_food++;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	239 put_things(ltype); /* Place objects (if any) */
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 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	242 * Place the staircase down. Only a small chance for an outside stairway.
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	243 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	244 if (ltype != OUTSIDE \|\| roll(1, 4) == 4) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	245 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	246 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	247 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	248 rnd_pos(&rooms[rm], &stairs);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	249 } until (mvinch(stairs.y, stairs.x) == FLOOR \|\| cnt++ > 5000);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	250 addch(STAIRS);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	251 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	252 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	253 * maybe add a trading post
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	254 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	255 if (level > 5 && rnd(11) == 7 && ltype == NORMLEV) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	256 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	257 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	258 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	259 if (rooms[rm].r_flags & ISTREAS)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	260 continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	261 rnd_pos(&rooms[rm], &stairs);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	262 } until (winat(stairs.y, stairs.x) == FLOOR \|\| cnt++ > 5000);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	263 addch(POST);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	264 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	265 if (ltype != POSTLEV) { /* Add monsters that fell through */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	266 nitem = tlist;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	267 while (nitem != NULL) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	268 item = nitem;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	269 nitem = next(item); /* because detach and attach mess up ptrs */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	270 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	271 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	272 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	273 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	274 rnd_pos(&rooms[rm], &tp->t_pos);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	275 } until (cnt++ > 5000 \|\| winat(tp->t_pos.y, tp->t_pos.x) == FLOOR);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	276 mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, tp->t_type);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	277 tp->t_oldch = CCHAR( mvwinch(cw, tp->t_pos.y, tp->t_pos.x) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	278
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 * If it has a fire, mark it
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	281 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	282 if (on(*tp, HASFIRE)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	283 register struct linked_list *fire_item;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	284
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	285 fire_item = creat_item();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	286 ldata(fire_item) = (char *) tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	287 attach(rooms[rm].r_fires, fire_item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	288 rooms[rm].r_flags \|= HASFIRE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	289 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	290 turn_off(*tp, ISELSEWHERE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	291 detach(tlist, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	292 attach(mlist, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	293 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	294 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	295
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	296 /* Restore any saved monsters */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	297 for (item = savmonst; item != NULL; item = nitem) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	298 nitem = next(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	299 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	300 mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, tp->t_type);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	301 tp->t_oldch = CCHAR( mvwinch(cw, tp->t_pos.y, tp->t_pos.x) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	302
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	303 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	304 * If it has a fire, mark it
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	305 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	306 if (on(*tp, HASFIRE)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	307 register struct linked_list *fire_item;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	308
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	309 fire_item = creat_item();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	310 ldata(fire_item) = (char *) tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	311 attach(rooms[rm].r_fires, fire_item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	312 rooms[rm].r_flags \|= HASFIRE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	313 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	314
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	315 detach(savmonst, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	316 attach(mlist, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	317 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	318
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	319 /* Restore any saved objects */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	320 for(item = savitems; item != NULL; item = nitem) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	321 nitem = next(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	322 obj = OBJPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	323 mvaddch(obj->o_pos.y, obj->o_pos.x, obj->o_type);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	324 detach(savitems, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	325 attach(lvl_obj, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	326 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	327
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	328
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	329 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	330 * Place the traps (except for trading post)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	331 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	332 ntraps = 0; /* No traps yet */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	333 if (levtype == NORMLEV) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	334 if (rnd(10) < vlevel) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	335 ntraps = rnd(vlevel/4)+1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	336 if (ntraps > MAXTRAPS)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	337 ntraps = MAXTRAPS;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	338 i = ntraps;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	339 while (i--)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	340 {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	341 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	342 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	343 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	344 if (rooms[rm].r_flags & ISTREAS)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	345 continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	346 rnd_pos(&rooms[rm], &stairs);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	347 } until (winat(stairs.y, stairs.x) == FLOOR \|\| cnt++ > 5000);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	348
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	349 traps[i].tr_flags = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	350
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	351 /* If we are at the bottom, we can't set a trap door */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	352 if (level >= nfloors) ch = (char) rnd(7) + 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	353 else ch = (char) rnd(8);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	354
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	355 switch((int) ch) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	356 case 0: ch = TRAPDOOR;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	357 when 1: ch = BEARTRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	358 when 2: ch = SLEEPTRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	359 when 3: ch = ARROWTRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	360 when 4: ch = TELTRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	361 when 5: ch = DARTTRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	362 when 6: ch = POOL;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	363 traps[i].tr_flags = ISFOUND;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	364 when 7: ch = MAZETRAP;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	365 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	366 addch(ch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	367 traps[i].tr_type = ch;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	368 traps[i].tr_show = FLOOR;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	369 traps[i].tr_pos = stairs;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	370 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	371 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	372 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	373 if (fresh) { /* A whole new picture */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	374 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	375 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	376 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	377 if (rooms[rm].r_flags & ISTREAS)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	378 continue;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	379 rnd_pos(&rooms[rm], &hero);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	380 } until( cnt++ > 5000 \|\|
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	381 (winat(hero.y, hero.x) == FLOOR &&
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	382 DISTANCE(hero.y, hero.x, stairs.y, stairs.x) > 16));
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	383 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	384 else { /* We're extending into an adjacent outside plane */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	385 rm = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	386 if (vert) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	387 if (hero.y == 1) hero.y = LINES - 3 - TERRASAVE; /* Top to bottom */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	388 else hero.y = TERRASAVE + 1; /* Bottom to top */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	389 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	390 else {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	391 if (hero.x == 0) hero.x = COLS - 1 - TERRASAVE; /* Right to left */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	392 else hero.x = TERRASAVE; /* Left to right */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	393 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	394 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	395 oldrp = &rooms[rm]; /* Set the current room */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	396 player.t_oldpos = player.t_pos; /* Set the current position */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	397 if (ISWEARING(R_AGGR) \|\|
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	398 (cur_misc[WEAR_JEWEL] != NULL &&
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	399 cur_misc[WEAR_JEWEL]->o_which == MM_JEWEL))
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	400 aggravate();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	401 light(&hero);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	402 wmove(cw, hero.y, hero.x);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	403 waddch(cw, PLAYER);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	404
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	405 if (level > cur_max)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	406 cur_max = level;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	407
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	408 status(TRUE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	409 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	410
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	411 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	412 * Pick a room that is really there
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	413 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	414
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	415 int
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	416 rnd_room(void)
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	417 {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	418 register int rm;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	419
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	420 if (levtype != NORMLEV)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	421 rm = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	422 else do
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	423 {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	424 rm = rnd(MAXROOMS);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	425 } while (rooms[rm].r_flags & ISGONE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	426 return rm;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	427 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	428
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	429 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	430 * put_things:
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	431 * put potions and scrolls on this level
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	432 * ltype: designates type of level to create
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	433 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	434
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	435 void
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	436 put_things(LEVTYPE ltype)
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	437 {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	438 register int i, rm, cnt;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	439 register struct object *cur;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	440 register struct linked_list item, exitptr;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	441 bool got_unique = FALSE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	442 int length, width;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	443 coord tp, *exit;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	444
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	445 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	446 * The only way to get new stuff is to go down into the dungeon.
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	447 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	448 if (level <= cur_max)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	449 return;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	450
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	451 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	452 * There is a chance that there is a treasure room on this level
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	453 * Increasing chance after level 9
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	454 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	455 if (ltype != MAZELEV && rnd(HARDER) < level - 8) {
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	456 register int j;
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	457 register struct room *rp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	458
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	459 /* Count the number of free spaces */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	460 i = 0; /* 0 tries */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	461 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	462 rp = &rooms[rnd_room()];
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	463 width = rp->r_max.y - 2;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	464 length = rp->r_max.x - 2;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	465 } until ((widthlength >= MAXTREAS) \|\| (i++ > MAXROOMS4));
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	466
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	467 /* Mark the room as a treasure room */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	468 rp->r_flags \|= ISTREAS;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	469
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	470 /* Make all the doors secret doors */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	471 for (exitptr = rp->r_exit; exitptr; exitptr = next(exitptr)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	472 exit = DOORPTR(exitptr);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	473 move(exit->y, exit->x);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	474 addch(SECRETDOOR);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	475 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	476
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	477 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	478 * check to see if there are any monsters in room already
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	479 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	480 for (item = mlist; item != NULL; item = next(item)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	481 register struct thing *tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	482
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	483 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	484 if (rp == roomin(&tp->t_pos)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	485 turn_on(*tp, ISMEAN);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	486 if (off(*tp, CANINWALL)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	487 tp->t_dest = &hero;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	488 turn_on(*tp, ISRUN);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	489 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	490 if (on(*tp, ISUNIQUE))
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	491 got_unique = TRUE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	492
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	493 /* If it is a mimic, undisguise it */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	494 if (on(*tp, ISDISGUISE))
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	495 turn_off(*tp, ISDISGUISE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	496 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	497 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	498
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	499
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	500 /* Put in the monsters and treasures */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	501 for (j=1; j<rp->r_max.y-1; j++)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	502 for (i=1; i<rp->r_max.x-1; i++) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	503 coord trp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	504
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	505 trp.y = rp->r_pos.y+j;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	506 trp.x = rp->r_pos.x+i;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	507
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	508 /* Monsters */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	509 if ((rnd(100) < (MAXTREAS100)/(widthlength)) &&
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	510 (mvwinch(mw, rp->r_pos.y+j, rp->r_pos.x+i) == ' ')) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	511 register struct thing *tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	512
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	513 /* Make a monster */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	514 item = new_item(sizeof *tp);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	515 tp = THINGPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	516
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	517 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	518 * Put it there and aggravate it (unless it can escape)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	519 * only put one UNIQUE per treasure room at most
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	520 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	521 if (got_unique)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	522 new_monster(item,randmonster(FALSE, TRUE),&trp,TRUE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	523 else
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	524 new_monster(item,randmonster(FALSE, FALSE),&trp,TRUE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	525 if (on(*tp, ISUNIQUE)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	526 got_unique = TRUE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	527 carry_obj(tp, monsters[tp->t_index].m_carry);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	528 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	529 turn_on(*tp, ISMEAN);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	530 if (off(*tp, CANINWALL)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	531 tp->t_dest = &hero;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	532 turn_on(*tp, ISRUN);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	533 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	534
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	535 /* If it is a mimic, undisguise it */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	536 if (on(*tp, ISDISGUISE))
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	537 turn_off(*tp, ISDISGUISE);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	538
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	539 if (on(*tp, HASFIRE)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	540 register struct linked_list *fire_item;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	541
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	542 fire_item = creat_item();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	543 ldata(fire_item) = (char *) tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	544 attach(rp->r_fires, fire_item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	545 rp->r_flags \|= HASFIRE;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	546 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	547 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	548
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	549 /* Treasures */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	550 if ((rnd(100) < (MAXTREAS100)/(widthlength)) &&
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	551 (mvinch(rp->r_pos.y+j, rp->r_pos.x+i) == FLOOR)) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	552 item = new_thing(ALL);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	553 attach(lvl_obj, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	554 cur = OBJPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	555
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	556 mvaddch(trp.y, trp.x, cur->o_type);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	557 cur->o_pos = trp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	558 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	559 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	560 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	561
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	562 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	563 * Do MAXOBJ attempts to put things on a level
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	564 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	565 for (i = 0; i < MAXOBJ; i++)
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	566 if (rnd(100) < 45) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	567 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	568 * Pick a new object and link it in the list
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	569 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	570 item = new_thing(ALL);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	571 attach(lvl_obj, item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	572 cur = OBJPTR(item);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	573 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	574 * Put it somewhere
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	575 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	576 cnt = 0;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	577 do {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	578 rm = rnd_room();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	579 rnd_pos(&rooms[rm], &tp);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	580 } until (winat(tp.y, tp.x) == FLOOR \|\| cnt++ > 500);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	581 mvaddch(tp.y, tp.x, cur->o_type);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	582 cur->o_pos = tp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	583 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	584 }

Mercurial > hg > early-roguelike

annotate arogue5/new_level.c @ 264:778938a5c21d