nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

More globals moved to instance_globals.

Browse Source
This commit is contained in:
Bart House
2018-12-19 21:26:35 -08:00
parent b7a0e69998
commit 576eece500
65 changed files with 498 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mkroom.c
View File

@@ -155,7 +155,7 @@ gottype:
for (sroom = &rooms[0];; sroom++) {
if (sroom->hx < 0)
return;
if (sroom - rooms >= nroom) {
if (sroom - rooms >= g.nroom) {
pline("rooms not closed by -1?");
return;
}
@@ -208,10 +208,10 @@ pick_room(strict)
register boolean strict;
{
register struct mkroom *sroom;
register int i = nroom;
register int i = g.nroom;
for (sroom = &rooms[rn2(nroom)]; i--; sroom++) {
if (sroom == &rooms[nroom])
for (sroom = &rooms[rn2(g.nroom)]; i--; sroom++) {
if (sroom == &rooms[g.nroom])
sroom = &rooms[0];
if (sroom->hx < 0)
return (struct mkroom *) 0;
@@ -515,7 +515,7 @@ mkswamp() /* Michiel Huisjes & Fred de Wilde */
register int sx, sy, i, eelct = 0;
for (i = 0; i < 5; i++) { /* turn up to 5 rooms swampy */
sroom = &rooms[rn2(nroom)];
sroom = &rooms[rn2(g.nroom)];
if (sroom->hx < 0 || sroom->rtype != OROOM || has_upstairs(sroom)
|| has_dnstairs(sroom))
continue;
@@ -822,8 +822,8 @@ int fd;
short i;
/* First, write the number of rooms */
bwrite(fd, (genericptr_t) &nroom, sizeof(nroom));
for (i = 0; i < nroom; i++)
bwrite(fd, (genericptr_t) &g.nroom, sizeof(g.nroom));
for (i = 0; i < g.nroom; i++)
save_room(fd, &rooms[i]);
}
@@ -836,9 +836,9 @@ struct mkroom *r;
mread(fd, (genericptr_t) r, sizeof(struct mkroom));
for (i = 0; i < r->nsubrooms; i++) {
r->sbrooms[i] = &subrooms[nsubroom];
rest_room(fd, &subrooms[nsubroom]);
subrooms[nsubroom++].resident = (struct monst *) 0;
r->sbrooms[i] = &subrooms[g.nsubroom];
rest_room(fd, &subrooms[g.nsubroom]);
subrooms[g.nsubroom++].resident = (struct monst *) 0;
}
}
@@ -852,14 +852,14 @@ int fd;
{
short i;
mread(fd, (genericptr_t) &nroom, sizeof(nroom));
nsubroom = 0;
for (i = 0; i < nroom; i++) {
mread(fd, (genericptr_t) &g.nroom, sizeof(g.nroom));
g.nsubroom = 0;
for (i = 0; i < g.nroom; i++) {
rest_room(fd, &rooms[i]);
rooms[i].resident = (struct monst *) 0;
}
rooms[nroom].hx = -1; /* restore ending flags */
subrooms[nsubroom].hx = -1;
rooms[g.nroom].hx = -1; /* restore ending flags */
subrooms[g.nsubroom].hx = -1;
}
/* convert a display symbol for terrain into topology type;