Early Roguelike Collection: arogue5/outside.c annotate

annotate arogue5/outside.c @ 234:c10fe421b8fb

Fix various overlooked causes of warnings. GCC5 now produces under 300 lines of warnings, but the remaining ones will require more complex solutions.

author	John "Elwin" Edwards
date	Sun, 06 Mar 2016 21:02:59 -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 * functions for dealing with the "outside" 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 * 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	9 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	10
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	11 #include "curses.h"
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	12 #include "rogue.h"
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	13
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	14 char rnd_terrain(void);
56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	15 char get_terrain(char one, char two, char three, char four);
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	16
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	17 /*
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	18 * init_terrain:
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	19 * Get the single "outside room" set up correctly
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	20 */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	21
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	22 void
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	23 init_terrain(void)
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 struct room *rp;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	26
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	27 for (rp = rooms; rp < &rooms[MAXROOMS]; rp++) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	28 rp->r_flags = ISGONE; /* kill all rooms */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	29 rp->r_fires = NULL; /* no fires */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	30 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	31 rp = &rooms[0]; /* point to only room */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	32 rp->r_flags = ISDARK; /* outside is always dark */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	33 rp->r_pos.x = 0; /* room fills whole screen */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	34 rp->r_pos.y = 1;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	35 rp->r_max.x = COLS;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	36 rp->r_max.y = LINES - 3;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	37 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	38
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	39
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 void
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	42 do_terrain(int basey, int basex, int deltay, int deltax, bool fresh)
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	43 {
218 56e748983fa8 Advanced Rogue 5: convert to ANSI function declarations. John "Elwin" Edwards parents: 63 diff changeset	44 int cury, curx; /* Current y and x positions */
63 0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	45
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	46 /* Lay out the boundary */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	47 for (cury=1; cury<LINES-2; cury++) { /* Vertical "walls" */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	48 mvaddch(cury, 0, '\|');
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	49 mvaddch(cury, COLS-1, '\|');
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 for (curx=0; curx<COLS; curx++) { /* Horizontal "walls" */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	52 mvaddch(1, curx, '-');
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	53 mvaddch(LINES-3, curx, '-');
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
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	56 /* If we are not continuing, let's start out with a line of terrain */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	57 if (fresh) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	58 char ch; /* Next char to add */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	59
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	60 /* Move to the starting point (should be (1, 0)) */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	61 move(basey, basex);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	62 curx = basex;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	63
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	64 /* Start with some random terrain */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	65 if (basex == 0) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	66 ch = rnd_terrain();
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	67 addch(ch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	68 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	69 else ch = CCHAR( mvinch(basey, basex) );
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 curx += deltax;
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 /* Fill in the rest of the line */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	74 while (curx > 0 && curx < COLS-1) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	75 /* Put in the next piece */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	76 ch = get_terrain(ch, '\0', '\0', '\0');
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	77 mvaddch(basey, curx, ch);
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	78 curx += deltax;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	79 }
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	80
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	81 basey++; /* Advance to next line */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	82 }
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 /* Fill in the rest of the lines */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	85 cury = basey;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	86 while (cury > 1 && cury < LINES - 3) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	87 curx = basex;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	88 while (curx > 0 && curx < COLS-1) {
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	89 register char left, top_left, top, top_right;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	90 register int left_pos, top_pos;
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 /* Get the surrounding terrain */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	93 left_pos = curx - deltax;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	94 top_pos = cury - deltay;
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	95
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	96 left = CCHAR( mvinch(cury, left_pos) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	97 top_left = CCHAR( mvinch(top_pos, left_pos) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	98 top = CCHAR( mvinch(top_pos, curx) );
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	99 top_right = CCHAR( mvinch(top_pos, curx + deltax) );
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 /* Put the piece of terrain on the map */
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490) elwin parents: diff changeset	102 mvaddch(cury, curx, get_terrain(left, top_left, top, top_right));
0ed67132cf10 Import Advanced Rogue 5.8 from the Roguelike Restoration Project (r1490)

Mercurial > hg > early-roguelike

annotate arogue5/outside.c @ 234:c10fe421b8fb