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

Revert "Fix g.restoring comments."

Browse Source 
This reverts commit ad725c0f0f.
This commit is contained in:
nhmall
2018-11-23 22:16:42 -05:00
parent 61a35d4ac0
commit 01bc4ab5e2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/restore.c
View File

@@ -58,7 +58,7 @@ static struct restore_procs {
/* /*
* Save a mapping of IDs from ghost levels to the current level. This * Save a mapping of IDs from ghost levels to the current level. This
* map is used by the timer routines when restoring ghost levels. * map is used by the timer routines when g.restoring ghost levels.
*/ */
#define N_PER_BUCKET 64 #define N_PER_BUCKET 64
struct bucket { struct bucket {
@@ -176,7 +176,7 @@ boolean ghostly;
Strcpy(damaged_shops, Strcpy(damaged_shops,
in_rooms(tmp_dam->place.x, tmp_dam->place.y, SHOPBASE)); in_rooms(tmp_dam->place.x, tmp_dam->place.y, SHOPBASE));
if (u.uz.dlevel) { if (u.uz.dlevel) {
/* when restoring, there are two passes over the current /* when g.restoring, there are two passes over the current
* level. the first time, u.uz isn't set, so neither is * level. the first time, u.uz isn't set, so neither is
* shop_keeper(). just wait and process the damage on * shop_keeper(). just wait and process the damage on
* the second pass. * the second pass.
@@ -209,7 +209,7 @@ struct obj *otmp;
mread(fd, (genericptr_t) otmp, sizeof(struct obj)); mread(fd, (genericptr_t) otmp, sizeof(struct obj));
/* next object pointers are invalid; otmp->cobj needs to be left /* next object pointers are invalid; otmp->cobj needs to be left
as is--being non-null is key to restoring container contents */ as is--being non-null is key to g.restoring container contents */
otmp->nobj = otmp->nexthere = (struct obj *) 0; otmp->nobj = otmp->nexthere = (struct obj *) 0;
/* non-null oextra needs to be reconstructed */ /* non-null oextra needs to be reconstructed */
if (otmp->oextra) { if (otmp->oextra) {
@@ -1018,7 +1018,7 @@ boolean ghostly;
setmode(fd, O_BINARY); setmode(fd, O_BINARY);
#endif #endif
/* Load the old fruit info. We have to do it first, so the /* Load the old fruit info. We have to do it first, so the
* information is available when restoring the objects. * information is available when g.restoring the objects.
*/ */
if (ghostly) if (ghostly)
g.oldfruit = loadfruitchn(fd); g.oldfruit = loadfruitchn(fd);
@@ -1619,7 +1619,7 @@ register unsigned int len;
if (g.restoring) { if (g.restoring) {
(void) nhclose(fd); (void) nhclose(fd);
(void) delete_savefile(); (void) delete_savefile();
error("Error restoring old game."); error("Error g.restoring old game.");
} }
panic("Error reading level file."); panic("Error reading level file.");
} }