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

main() reorganization (trunk only)

Browse Source 
Move some internals-related code out of port-specific main so that
it isn't duplicated a bunch of times.  One minor side-effect of this
change is that if you auto-pickup something at the very start of a game,
it will happen after any full moon/new moon/Friday 13th message rather
than before.  There's a second change for some:  the shared main() used
by several of the micro ports had a small difference in game play--if you
saved a game while on an engraving, it would automatically be read when
you resume--that will now occur for everybody [Elbereth weenies rejoice!].
pcmain() was also calling update_inventory() at start of play.  That's
unnecessary for new games, where inventory initialization triggers a call
to it for each item added to your pack; but I wasn't sure about restored
games, so everybody gets it there now.

     The Mac and BeOS ports evidently haven't been touched it some time;
they still referenced flags.move which got replaced by context.move quite
a while back.  The Windows GUI code has a declaration for mswin_moveloop()
which appears to be non-existant, but I left it alone.  I assume that the
Qt interface uses the existing main() routines; at least I couldn't find
any start of game code specific to it.  vmsmain's revised main() is the
only one which has been tested.
This commit is contained in:
nethack.rankin
2006-04-02 07:35:30 +00:00
parent 8ed2748d52
commit 2c0a072ef1
9 changed files with 94 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sys/be/bemain.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)bemain.c 3.5 1998/07/15 */
/* SCCS Id: @(#)bemain.c 3.5 2006/04/01 */
/* Copyright (c) Dean Luick, 1996. */
/* NetHack may be freely redistributed. See license for details. */
@@ -22,7 +22,8 @@ static void getlock(void);
int MAIN(int argc, char **argv)
{
int fd;
char *dir;
char *dir;
boolean resuming = FALSE; /* assume new game */
dir = nh_getenv("NETHACKDIR");
if (!dir) dir = nh_getenv("HACKDIR");
@@ -93,37 +94,32 @@ int MAIN(int argc, char **argv)
#endif
pline("Restoring save file...");
mark_synch(); /* flush output */
if(!dorecover(fd))
goto not_recovered;
if (dorecover(fd)) {
resuming = TRUE; /* not starting new game */
#ifdef WIZARD
if(!wizard && remember_wiz_mode) wizard = TRUE;
if (!wizard && remember_wiz_mode) wizard = TRUE;
#endif
check_special_room(FALSE);
if (discover)
if (discover)
You("are in non-scoring discovery mode.");
if (discover || wizard) {
if (discover || wizard) {
if(yn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
nh_compress(fqname(SAVEF, SAVEPREFIX, 0));
}
}
}
}
flags.move = 0;
} else {
not_recovered:
if (!resuming) {
player_selection();
newgame();
if (discover)
You("are in non-scoring discovery mode.");
flags.move = 0;
set_wear();
(void) pickup(1);
}
moveloop();
moveloop(resuming);
return 0;
}