X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/1c987590202c8ca8dec65a88afd1d73328d55b39..1473e837300a6a867630da6e114a3c6262e28a85:/rogue/init.c

diff --git a/rogue/init.c b/rogue/init.c
index 51a09752..982a95cb 100644
--- a/rogue/init.c
+++ b/rogue/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.15 2007/12/27 23:53:00 dholland Exp $	*/
+/*	$NetBSD: init.c,v 1.18 2008/08/08 16:10:47 drochner Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: init.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
+__RCSID("$NetBSD: init.c,v 1.18 2008/08/08 16:10:47 drochner Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,13 +58,20 @@ __RCSID("$NetBSD: init.c,v 1.15 2007/12/27 23:53:00 dholland Exp $");
 
 #include "rogue.h"
 
+static void do_args(int, char **);
+static void do_opts(void);
+static void env_get_value(char **, char *, boolean);
+static void init_str(char **, const char *);
+static void player_init(void);
+
+static char *rest_file = NULL;
+static boolean init_curses = 0;
+
 char login_name[MAX_OPT_LEN];
-char *nick_name = (char *) 0;
-char *rest_file = 0;
+char *nick_name = NULL;
 boolean cant_int = 0;
 boolean did_int = 0;
 boolean score_only;
-boolean init_curses = 0;
 boolean save_is_interactive = 1;
 boolean ask_quit = 1;
 boolean no_skull = 0;
@@ -74,9 +81,7 @@ const char *byebye_string = "Okay, bye bye!";
 gid_t gid, egid;
 
 int
-init(argc, argv)
-	int argc;
-	char *argv[];
+init(int argc, char *argv[])
 {
 	const char *pn;
 	int seed;
@@ -97,7 +102,7 @@ init(argc, argv)
 		clean_up("Hey!  Who are you?");
 	}
 	/* LOGIN_NAME_SIZE == MAX_OPT_LEN now, but just in case... */
-	(void) strlcpy(login_name, pn, sizeof(login_name));
+	(void)strlcpy(login_name, pn, sizeof(login_name));
 
 	do_args(argc, argv);
 	do_opts();
@@ -108,9 +113,12 @@ init(argc, argv)
 		fflush(stdout);
 	}
 
-	initscr();
+	if (!initscr()) {
+		fprintf(stderr, "couldn't initialize screen\n");
+		exit (0);
+	}
 	if ((LINES < DROWS) || (COLS < DCOLS)) {
-		clean_up("must be played on 24 x 80 screen");
+		clean_up("must be played on at least 80 x 24 screen");
 	}
 	start_window();
 	init_curses = 1;
@@ -118,10 +126,10 @@ init(argc, argv)
 	md_heed_signals();
 
 	if (score_only) {
-		put_scores((object *) 0, 0);
+		put_scores(NULL, 0);
 	}
 	seed = md_gseed();
-	(void) srrandom(seed);
+	(void)srrandom(seed);
 	if (rest_file) {
 		restore(rest_file);
 		return(1);
@@ -130,23 +138,23 @@ init(argc, argv)
 	get_wand_and_ring_materials();
 	make_scroll_titles();
 
-	level_objects.next_object = (object *) 0;
-	level_monsters.next_monster = (object *) 0;
+	level_objects.next_object = NULL;
+	level_monsters.next_monster = NULL;
 	player_init();
 	ring_stats(0);
 	return(0);
 }
 
-void
-player_init()
+static void
+player_init(void)
 {
 	object *obj;
 
-	rogue.pack.next_object = (object *) 0;
+	rogue.pack.next_object = NULL;
 
 	obj = alloc_object();
 	get_food(obj, 1);
-	(void) add_to_pack(obj, &rogue.pack, 1);
+	(void)add_to_pack(obj, &rogue.pack, 1);
 
 	obj = alloc_object();		/* initial armor */
 	obj->what_is = ARMOR;
@@ -154,7 +162,7 @@ player_init()
 	obj->class = RINGMAIL+2;
 	obj->is_protected = 0;
 	obj->d_enchant = 1;
-	(void) add_to_pack(obj, &rogue.pack, 1);
+	(void)add_to_pack(obj, &rogue.pack, 1);
 	do_wear(obj);
 
 	obj = alloc_object();		/* initial weapons */
@@ -163,7 +171,7 @@ player_init()
 	obj->damage = "2d3";
 	obj->hit_enchant = obj->d_enchant = 1;
 	obj->identified = 1;
-	(void) add_to_pack(obj, &rogue.pack, 1);
+	(void)add_to_pack(obj, &rogue.pack, 1);
 	do_wield(obj);
 
 	obj = alloc_object();
@@ -173,7 +181,7 @@ player_init()
 	obj->hit_enchant = 1;
 	obj->d_enchant = 0;
 	obj->identified = 1;
-	(void) add_to_pack(obj, &rogue.pack, 1);
+	(void)add_to_pack(obj, &rogue.pack, 1);
 
 	obj = alloc_object();
 	obj->what_is = WEAPON;
@@ -183,12 +191,11 @@ player_init()
 	obj->hit_enchant = 0;
 	obj->d_enchant = 0;
 	obj->identified = 1;
-	(void) add_to_pack(obj, &rogue.pack, 1);
+	(void)add_to_pack(obj, &rogue.pack, 1);
 }
 
 void
-clean_up(estr)
-	const char *estr;
+clean_up(const char *estr)
 {
 	if (save_is_interactive) {
 		if (init_curses) {
@@ -202,7 +209,7 @@ clean_up(estr)
 }
 
 void
-start_window()
+start_window(void)
 {
 	cbreak();
 	noecho();
@@ -212,14 +219,13 @@ start_window()
 }
 
 void
-stop_window()
+stop_window(void)
 {
 	endwin();
 }
 
 void
-byebye(dummy)
-	int dummy __unused;
+byebye(int dummy __unused)
 {
 	md_ignore_signals();
 	if (ask_quit) {
@@ -231,8 +237,7 @@ byebye(dummy)
 }
 
 void
-onintr(dummy)
-	int dummy __unused;
+onintr(int dummy __unused)
 {
 	md_ignore_signals();
 	if (cant_int) {
@@ -245,20 +250,17 @@ onintr(dummy)
 }
 
 void
-error_save(dummy)
-	int dummy __unused;
+error_save(int dummy __unused)
 {
 	save_is_interactive = 0;
 	save_into_file(error_file);
 	clean_up("");
 }
 
-void
-do_args(argc, argv)
-	int argc;
-	char *argv[];
+static void
+do_args(int argc, char *argv[])
 {
-	short i, j;
+	int i, j;
 
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] == '-') {
@@ -275,8 +277,8 @@ do_args(argc, argv)
 	}
 }
 
-void
-do_opts()
+static void
+do_opts(void)
 {
 	char *eptr;
 
@@ -323,10 +325,8 @@ do_opts()
 	init_str(&fruit, "slime-mold");
 }
 
-void
-env_get_value(s, e, add_blank)
-	char **s, *e;
-	boolean add_blank;
+static void
+env_get_value(char **s, char *e, boolean add_blank)
 {
 	short i = 0;
 	const char *t;
@@ -346,23 +346,21 @@ env_get_value(s, e, add_blank)
 	*s = md_malloc(MAX_OPT_LEN + 2);
 	if (*s == NULL)
 		clean_up("out of memory");
-	(void) strncpy(*s, t, i);
+	(void)strncpy(*s, t, i);
 	if (add_blank) {
 		(*s)[i++] = ' ';
 	}
 	(*s)[i] = '\0';
 }
 
-void
-init_str(str, dflt)
-	char **str;
-	const char *dflt;
+static void
+init_str(char **str, const char *dflt)
 {
 	if (!(*str)) {
 		/* note: edit_opts() in room.c depends on this size */
 		*str = md_malloc(MAX_OPT_LEN + 2);
 		if (*str == NULL)
 			clean_up("out of memory");
-		(void) strlcpy(*str, dflt, MAX_OPT_LEN + 2);
+		(void)strlcpy(*str, dflt, MAX_OPT_LEN + 2);
 	}
 }