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

Reformat all C files.

Browse Source 
I'll push a formatting guide at some point. There may still be
outstanding changes, but please feel free to resolve those as you arrive
a them.

To the best of my knowledge, there is no changes to the actual code
content, but the formatter does have the occasional bug. If you run into
an issue, please fix it!
This commit is contained in:
Sean Hunt
2015-05-09 13:43:16 -04:00
parent 167800afdf
commit 97d6fade74
270 changed files with 182649 additions and 173878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

396
sys/be/bemain.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 bemain.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.6 bemain.c $NHDT-Date: 1431192781 2015/05/09 17:33:01 $ $NHDT-Branch: master $:$NHDT-Revision: 1.16 $ */
/* NetHack 3.6 bemain.c $Date: 2009/05/06 10:48:59 $ $Revision: 1.11 $ */
/* SCCS Id: @(#)bemain.c 3.5 2008/01/30 */
/* Copyright (c) Dean Luick, 1996. */
@@ -14,245 +14,254 @@ static void chdirx(const char *dir);
static void getlock(void);
#ifdef __begui__
#define MAIN nhmain
int nhmain(int argc, char **argv);
#define MAIN nhmain
int nhmain(int argc, char **argv);
#else
#define MAIN main
#define MAIN main
#endif
int MAIN(int argc, char **argv)
int
MAIN(int argc, char **argv)
{
int fd;
char *dir;
boolean resuming = FALSE; /* assume new game */
int fd;
char *dir;
boolean resuming = FALSE; /* assume new game */
sys_early_init();
sys_early_init();
dir = nh_getenv("NETHACKDIR");
if (!dir) dir = nh_getenv("HACKDIR");
dir = nh_getenv("NETHACKDIR");
if (!dir)
dir = nh_getenv("HACKDIR");
choose_windows(DEFAULT_WINDOW_SYS);
chdirx(dir);
initoptions();
choose_windows(DEFAULT_WINDOW_SYS);
chdirx(dir);
initoptions();
init_nhwindows(&argc, argv);
whoami();
init_nhwindows(&argc, argv);
whoami();
/*
* It seems you really want to play.
*/
u.uhp = 1; /* prevent RIP on early quits */
process_options(argc, argv); /* command line options */
/*
* It seems you really want to play.
*/
u.uhp = 1; /* prevent RIP on early quits */
process_options(argc, argv); /* command line options */
set_playmode(); /* sets plname to "wizard" for wizard mode */
/* strip role,race,&c suffix; calls askname() if plname[] is empty
or holds a generic user name like "player" or "games" */
plnamesuffix();
/* unlike Unix where the game might be invoked with a script
which forces a particular character name for each player
using a shared account, we always allow player to rename
the character during role/race/&c selection */
iflags.renameallowed = TRUE;
set_playmode(); /* sets plname to "wizard" for wizard mode */
/* strip role,race,&c suffix; calls askname() if plname[] is empty
or holds a generic user name like "player" or "games" */
plnamesuffix();
/* unlike Unix where the game might be invoked with a script
which forces a particular character name for each player
using a shared account, we always allow player to rename
the character during role/race/&c selection */
iflags.renameallowed = TRUE;
getlock();
getlock();
dlb_init(); /* must be before newgame() */
dlb_init(); /* must be before newgame() */
/*
* Initialize the vision system. This must be before mklev() on a
* new game or before a level restore on a saved game.
*/
vision_init();
/*
* Initialize the vision system. This must be before mklev() on a
* new game or before a level restore on a saved game.
*/
vision_init();
display_gamewindows();
display_gamewindows();
/*
* First, try to find and restore a save file for specified character.
* We'll return here if new game player_selection() renames the hero.
*/
attempt_restore:
if ((fd = restore_saved_game()) >= 0) {
/*
* First, try to find and restore a save file for specified character.
* We'll return here if new game player_selection() renames the hero.
*/
attempt_restore:
if ((fd = restore_saved_game()) >= 0) {
#ifdef NEWS
if(iflags.news) {
display_file(NEWS, FALSE);
iflags.news = FALSE; /* in case dorecover() fails */
}
if (iflags.news) {
display_file(NEWS, FALSE);
iflags.news = FALSE; /* in case dorecover() fails */
}
#endif
pline("Restoring save file...");
mark_synch(); /* flush output */
if (dorecover(fd)) {
resuming = TRUE; /* not starting new game */
if (discover)
You("are in non-scoring discovery mode.");
if (discover || wizard) {
if(yn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
nh_compress(fqname(SAVEF, SAVEPREFIX, 0));
}
}
}
}
pline("Restoring save file...");
mark_synch(); /* flush output */
if (dorecover(fd)) {
resuming = TRUE; /* not starting new game */
if (discover)
You("are in non-scoring discovery mode.");
if (discover || wizard) {
if (yn("Do you want to keep the save file?") == 'n')
(void) delete_savefile();
else {
nh_compress(fqname(SAVEF, SAVEPREFIX, 0));
}
}
}
}
if (!resuming) {
/* new game: start by choosing role, race, etc;
player might change the hero's name while doing that,
in which case we try to restore under the new name
and skip selection this time if that didn't succeed */
if (!iflags.renameinprogress) {
player_selection();
if (iflags.renameinprogress) {
/* player has renamed the hero while selecting role;
discard current lock file and create another for
the new character name */
delete_levelfile(0); /* remove empty lock file */
getlock();
goto attempt_restore;
}
}
newgame();
if (discover)
You("are in non-scoring discovery mode.");
}
if (!resuming) {
/* new game: start by choosing role, race, etc;
player might change the hero's name while doing that,
in which case we try to restore under the new name
and skip selection this time if that didn't succeed */
if (!iflags.renameinprogress) {
player_selection();
if (iflags.renameinprogress) {
/* player has renamed the hero while selecting role;
discard current lock file and create another for
the new character name */
delete_levelfile(0); /* remove empty lock file */
getlock();
goto attempt_restore;
}
}
newgame();
if (discover)
You("are in non-scoring discovery mode.");
}
moveloop(resuming);
return 0;
moveloop(resuming);
return 0;
}
static void whoami(void)
static void
whoami(void)
{
/*
* Who am i? Algorithm: 1. Use name as specified in NETHACKOPTIONS
* 2. Use $USER or $LOGNAME (if 1. fails)
* The resulting name is overridden by command line options.
* If everything fails, or if the resulting name is some generic
* account like "games", "play", "player", "hack" then eventually
* we'll ask him.
*/
char *s;
/*
* Who am i? Algorithm: 1. Use name as specified in NETHACKOPTIONS
* 2. Use $USER or $LOGNAME (if 1. fails)
* The resulting name is overridden by command line options.
* If everything fails, or if the resulting name is some generic
* account like "games", "play", "player", "hack" then eventually
* we'll ask him.
*/
char *s;
if (*plname) return;
if (s = nh_getenv("USER")) {
(void) strncpy(plname, s, sizeof(plname)-1);
return;
}
if (s = nh_getenv("LOGNAME")) {
(void) strncpy(plname, s, sizeof(plname)-1);
return;
}
if (*plname)
return;
if (s = nh_getenv("USER")) {
(void) strncpy(plname, s, sizeof(plname) - 1);
return;
}
if (s = nh_getenv("LOGNAME")) {
(void) strncpy(plname, s, sizeof(plname) - 1);
return;
}
}
/* normalize file name - we don't like .'s, /'s, spaces */
void regularize(char *s)
void
regularize(char *s)
{
register char *lp;
register char *lp;
while((lp=strchr(s, '.')) || (lp=strchr(s, '/')) || (lp=strchr(s,' ')))
*lp = '_';
while ((lp = strchr(s, '.')) || (lp = strchr(s, '/'))
|| (lp = strchr(s, ' ')))
*lp = '_';
}
static void process_options(int argc, char **argv)
static void
process_options(int argc, char **argv)
{
int i;
int i;
while (argc > 1 && argv[1][0] == '-') {
argv++;
argc--;
switch (argv[0][1]) {
case 'D':
wizard = TRUE, discover = FALSE;
break;
/* otherwise fall thru to discover */
case 'X':
discover = TRUE, wizard = FALSE;
break;
while (argc > 1 && argv[1][0] == '-') {
argv++;
argc--;
switch (argv[0][1]) {
case 'D':
wizard = TRUE, discover = FALSE;
break;
/* otherwise fall thru to discover */
case 'X':
discover = TRUE, wizard = FALSE;
break;
#ifdef NEWS
case 'n':
iflags.news = FALSE;
break;
case 'n':
iflags.news = FALSE;
break;
#endif
case 'u':
if(argv[0][2])
(void) strncpy(plname, argv[0]+2, sizeof(plname)-1);
else if (argc > 1) {
argc--;
argv++;
(void) strncpy(plname, argv[0], sizeof(plname)-1);
} else
raw_print("Player name expected after -u");
break;
case 'p': /* profession (role) */
if (argv[0][2]) {
if ((i = str2role(&argv[0][2])) >= 0)
flags.initrole = i;
} else if (argc > 1) {
argc--;
argv++;
if ((i = str2role(argv[0])) >= 0)
flags.initrole = i;
}
break;
case 'r': /* race */
if (argv[0][2]) {
if ((i = str2race(&argv[0][2])) >= 0)
flags.initrace = i;
} else if (argc > 1) {
argc--;
argv++;
if ((i = str2race(argv[0])) >= 0)
flags.initrace = i;
}
break;
case '@':
flags.randomall = 1;
break;
default:
raw_printf("Unknown option: %s", *argv);
break;
}
}
case 'u':
if (argv[0][2])
(void) strncpy(plname, argv[0] + 2, sizeof(plname) - 1);
else if (argc > 1) {
argc--;
argv++;
(void) strncpy(plname, argv[0], sizeof(plname) - 1);
} else
raw_print("Player name expected after -u");
break;
case 'p': /* profession (role) */
if (argv[0][2]) {
if ((i = str2role(&argv[0][2])) >= 0)
flags.initrole = i;
} else if (argc > 1) {
argc--;
argv++;
if ((i = str2role(argv[0])) >= 0)
flags.initrole = i;
}
break;
case 'r': /* race */
if (argv[0][2]) {
if ((i = str2race(&argv[0][2])) >= 0)
flags.initrace = i;
} else if (argc > 1) {
argc--;
argv++;
if ((i = str2race(argv[0])) >= 0)
flags.initrace = i;
}
break;
case '@':
flags.randomall = 1;
break;
default:
raw_printf("Unknown option: %s", *argv);
break;
}
}
}
static void chdirx(const char *dir)
static void
chdirx(const char *dir)
{
if (!dir) dir = HACKDIR;
if (!dir)
dir = HACKDIR;
if (chdir(dir) < 0)
error("Cannot chdir to %s.", dir);
if (chdir(dir) < 0)
error("Cannot chdir to %s.", dir);
/* Warn the player if we can't write the record file */
/* perhaps we should also test whether . is writable */
check_recordfile(dir);
/* Warn the player if we can't write the record file */
/* perhaps we should also test whether . is writable */
check_recordfile(dir);
}
void getlock(void)
void
getlock(void)
{
int fd;
int fd;
Sprintf(lock, "%d%s", getuid(), plname);
regularize(lock);
set_levelfile_name(lock, 0);
fd = creat(lock, FCMASK);
if(fd == -1) {
error("cannot creat lock file.");
} else {
if(write(fd, (genericptr_t) &hackpid, sizeof(hackpid))
!= sizeof(hackpid)){
error("cannot write lock");
}
if(close(fd) == -1) {
error("cannot close lock");
}
}
Sprintf(lock, "%d%s", getuid(), plname);
regularize(lock);
set_levelfile_name(lock, 0);
fd = creat(lock, FCMASK);
if (fd == -1) {
error("cannot creat lock file.");
} else {
if (write(fd, (genericptr_t) &hackpid, sizeof(hackpid))
!= sizeof(hackpid)) {
error("cannot write lock");
}
if (close(fd) == -1) {
error("cannot close lock");
}
}
}
/* validate wizard mode if player has requested access to it */
boolean
authorize_wizard_mode()
{
/* other ports validate user name or character name here */
return TRUE;
/* other ports validate user name or character name here */
return TRUE;
}
#ifndef __begui__
@@ -261,9 +270,10 @@ authorize_wizard_mode()
* do anything extra.
*/
void nethack_exit(int status);
void nethack_exit(int status)
void
nethack_exit(int status)
{
exit(status);
exit(status);
}
#endif /* !__begui__ */