Merge upstream (can't test, hopefully nothing broke)

[bsdgames-darwin.git] / rogue / rogue.h

diff --git a/rogue/rogue.h b/rogue/rogue.h
index e46de5d8ac39ff297196479e93c0f6ea8176ae79..8ce9411ea806ce7459302fb702fa1569112bcc69 100644 (file)
--- a/rogue/rogue.h
+++ b/rogue/rogue.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: rogue.h,v 1.20 2009/08/12 08:44:45 dholland Exp $      */
+/*     $NetBSD: rogue.h,v 1.24 2013/08/11 03:44:27 dholland Exp $      */
 
 /*
  * Copyright (c) 1988, 1993
@@ -221,7 +221,7 @@ struct obj {                                /* comment is monster meaning */
        unsigned long m_flags;  /* monster flags */
        const char *damage;             /* damage it does */
        short quantity;                 /* hit points to kill */
-       short ichar;                    /* 'A' is for aquatar */
+       short ichar;                    /* 'A' is for aquator */
        short kill_exp;                 /* exp for killing it */
        short is_protected;             /* level starts */
        short is_cursed;                /* level ends */
@@ -248,7 +248,7 @@ typedef struct obj object;
 #define INIT_STR       16
 #define INIT_EXPLEVEL  1
 #define INIT_EXP       0
-#define INIT_PACK      {0}
+#define INIT_PACK      {0,NULL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,NULL}
 #define INIT_GOLD      0
 #define INIT_CHAR      '@'
 #define INIT_MOVES     1250
@@ -466,7 +466,7 @@ void        check_gold_seeker(object *);
 boolean        check_imitator(object *);
 void   check_message(void);
 int    check_up(void);
-void   clean_up(const char *) __attribute__((__noreturn__));
+void   clean_up(const char *) __dead;
 void   clear_level(void);
 void   cnfs(void);
 int    coin_toss(void);
@@ -483,7 +483,7 @@ void        drop(void);
 int    drop_check(void);
 void   eat(void);
 void   edit_opts(void);
-void   error_save(int) __attribute__((__noreturn__));
+void   error_save(int) __dead;
 void   fight(boolean);
 boolean        flame_broil(object *);
 void   free_object(object *);
@@ -526,7 +526,7 @@ boolean     is_direction(short, short *);
 boolean        is_passable(int, int);
 boolean        is_vowel(short);
 void   kick_into_pack(void);
-void   killed_by(const object *, short) __attribute__((__noreturn__));
+void   killed_by(const object *, short) __dead;
 long   lget_number(const char *);
 void   light_passage(int, int);
 void   light_up_room(int);
@@ -534,7 +534,7 @@ boolean     m_confuse(object *);
 void   make_level(void);
 void   make_scroll_titles(void);
 boolean        md_df(const char *);
-void   md_exit(int) __attribute__((__noreturn__));
+void   md_exit(int) __dead;
 void   md_gct(struct rogue_time *);
 int    md_get_file_id(const char *);
 void   md_gfmt(const char *, struct rogue_time *);
@@ -547,8 +547,7 @@ void        md_shell(const char *);
 void   md_sleep(int);
 void   md_slurp(void);
 /*void message(const char *, boolean);*/
-void   messagef(boolean, const char *, ...)
-               __attribute__((__format__(__printf__, 2, 3)));
+void   messagef(boolean, const char *, ...) __printflike(2, 3);
 void   mix_colors(void);
 int    mon_can_go(const object *, short, short);
 int    mon_damage(object *, short);
@@ -577,7 +576,7 @@ void        put_mons(void);
 void   put_objects(void);
 void   put_on_ring(void);
 void   put_player(short);
-void   put_scores(const object *, short) __attribute__((__noreturn__));
+void   put_scores(const object *, short) __dead;
 void   put_stairs(void);
 void   quaff(void);
 void   quit(boolean);
@@ -631,7 +630,7 @@ void        wake_up(object *);
 void   wanderer(void);
 void   wear(void);
 void   wield(void);
-void   win(void) __attribute__((__noreturn__));
+void   win(void) __dead;
 void   wizardize(void);
 long   xxx(boolean);
 void   xxxx(char *, short);
@@ -667,7 +666,7 @@ extern      char    hit_message[HIT_MESSAGE_SIZE];
 extern char    hunger_str[HUNGER_STR_LEN];
 extern char    login_name[MAX_OPT_LEN];
 extern const char   *byebye_string;
-extern const char   *curse_message;
+extern const char   curse_message[];
 extern const char   *error_file;
 extern char   *fruit;
 extern const char   *const m_names[];
@@ -676,7 +675,7 @@ extern      const char   *new_level_message;
 extern char   *nick_name;
 extern const char   *press_space;
 extern char   *save_file;
-extern const char   *you_can_move_again;
+extern const char   you_can_move_again[];
 extern const long      level_points[];
 extern short   add_strength;
 extern short   auto_search;