summaryrefslogtreecommitdiffstats
path: root/rogue/rogue.h
diff options
context:
space:
mode:
Diffstat (limited to 'rogue/rogue.h')
-rw-r--r--rogue/rogue.h80
1 files changed, 16 insertions, 64 deletions
diff --git a/rogue/rogue.h b/rogue/rogue.h
index 64747981..e765467b 100644
--- a/rogue/rogue.h
+++ b/rogue/rogue.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rogue.h,v 1.18 2007/12/27 23:53:00 dholland Exp $ */
+/* $NetBSD: rogue.h,v 1.19 2008/01/14 03:50:02 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -242,8 +242,8 @@ struct obj { /* comment is monster meaning */
typedef struct obj object;
-#define INIT_AW (object*)0
-#define INIT_RINGS (object*)0
+#define INIT_AW NULL
+#define INIT_RINGS NULL
#define INIT_HP 12
#define INIT_STR 16
#define INIT_EXPLEVEL 1
@@ -293,9 +293,9 @@ typedef struct rm room;
#define MAXROOMS 9
#define BIG_ROOM 10
-#define NO_ROOM -1
+#define NO_ROOM (-1)
-#define PASSAGE -3 /* cur_room value */
+#define PASSAGE (-3) /* cur_room value */
#define AMULET_LEVEL 26
@@ -349,7 +349,6 @@ extern struct id id_rings[];
extern struct id id_weapons[];
extern struct id id_armors[];
-extern object mon_tab[];
extern object level_monsters;
#define MONSTERS 26
@@ -448,19 +447,17 @@ object *check_duplicate(object *, object *);
const char *get_ench_color(void);
object *get_letter_object(int);
object *get_thrown_at_monster(object *, short, short *, short *);
-object *get_zapped_monster(short, short *, short *);
object *gr_monster(object *, int);
object *gr_object(void);
char *md_getenv(const char *);
const char *
md_gln(void);
-char *md_malloc(int);
+void *md_malloc(size_t);
const char *mon_name(const object *);
const char *name_of(const object *);
object *object_at(object *, short, short);
object *pick_up(int, int, short *);
void add_exp(int, boolean);
-void add_mazes(void);
void add_traps(void);
void aggravate(void);
void aim_monster(object *);
@@ -469,7 +466,7 @@ void byebye(int);
void c_object_for_wizard(void);
void call_it(void);
boolean can_move(int, int, int, int);
-boolean can_turn(int, int);
+boolean can_turn(short, short);
void center(short, const char *);
void check_gold_seeker(object *);
boolean check_hunger(boolean);
@@ -480,46 +477,32 @@ void clean_up(const char *) __attribute__((__noreturn__));
void clear_level(void);
void cnfs(void);
int coin_toss(void);
-int connect_rooms(short, short);
void cough_up(object *);
void create_monster(void);
-int damage_for_strength(void);
void darken_room(short);
-void disappear(object *);
-void do_args(int, char **);
-void do_opts(void);
void do_put_on(object *, boolean);
void do_shell(void);
void do_wear(object *);
void do_wield(object *);
void dr_course(object *, boolean, short, short);
-void drain_life(void);
void draw_magic_map(void);
-void draw_simple_passage(short, short, short, short, short);
void drop(void);
int drop_check(void);
-void drop_level(void);
void eat(void);
void edit_opts(void);
-void env_get_value(char **, char *, boolean);
void error_save(int) __attribute__((__noreturn__));
-void fight(int);
-void fill_it(int, boolean);
-void fill_out_level(void);
+void fight(boolean);
boolean flame_broil(object *);
int flit(object *);
void flop_weapon(object *, short, short);
void free_object(object *);
void free_stuff(object *);
-void freeze(object *);
int get_armor_class(const object *);
int get_com_id(int *, short);
int get_damage(const char *, boolean);
void get_desc(const object *, char *, size_t);
-int get_dir(short, short, short, short);
void get_dir_rc(short, short *, short *, short);
char get_dungeon_char(short, short);
-int get_exp_level(long);
void get_food(object *, boolean);
int get_hit_chance(const object *);
int get_input_line(const char *, const char *, char *, size_t, const char *, boolean, boolean);
@@ -529,13 +512,11 @@ boolean get_oth_room(short, short *, short *);
int get_rand(int, int);
short get_room_number(int, int);
int get_value(const object *);
-int get_w_damage(const object *);
void get_wand_and_ring_materials(void);
int get_weapon_damage(const object *);
char gmc(object *);
char gmc_row_col(int, int);
void go_blind(void);
-boolean gold_at(int, int);
void gr_armor(object *);
char gr_dir(void);
char gr_obj_char(void);
@@ -548,9 +529,7 @@ void gr_wand(object *);
void gr_weapon(object *, int);
void hallucinate(void);
boolean has_amulet(void);
-boolean has_been_touched(const struct rogue_time *, const struct rogue_time *);
void heal(void);
-void hide_boxed_passage(int, int, int, int, int);
void hold_monster(void);
int hp_raise(void);
void id_all(void);
@@ -558,9 +537,8 @@ void id_com(void);
void id_trap(void);
void id_type(void);
void idntfy(void);
-boolean imitating(int, int);
+boolean imitating(short, short);
int init(int, char **);
-void init_str(char **, const char *);
void insert_score(char [][82], char [][30], const char *, short, short, const object *, int);
void inv_armor_weapon(boolean);
void inv_rings(void);
@@ -578,12 +556,9 @@ void light_passage(int, int);
void light_up_room(int);
boolean m_confuse(object *);
void make_level(void);
-void make_maze(short, short, short, short, short, short);
void make_party(void);
-void make_room(short, short, short, short);
void make_scroll_titles(void);
boolean mask_pack(const object *, unsigned short);
-boolean mask_room(short, short *, short *, unsigned short);
boolean md_df(const char *);
void md_exit(int) __attribute__((__noreturn__));
void md_gct(struct rogue_time *);
@@ -601,17 +576,16 @@ void md_slurp(void);
void messagef(boolean, const char *, ...)
__attribute__((__format__(__printf__, 2, 3)));
void mix_colors(void);
-void mix_random_rooms(void);
-int mon_can_go(const object *, int, int);
+int mon_can_go(const object *, short, short);
int mon_damage(object *, short);
void mon_hit(object *);
boolean mon_sees(const object *, int, int);
int move_confused(object *);
-void move_mon_to(object *, int, int);
+void move_mon_to(object *, short, short);
void move_onto(void);
-int mtry(object *, int, int);
+int mtry(object *, short, short);
void multiple_move_rogue(short);
-void mv_1_monster(object *, int, int);
+void mv_1_monster(object *, short, short);
void mv_aquatars(void);
void mv_mons(void);
int name_cmp(char *, const char *);
@@ -630,17 +604,15 @@ void pad(const char *, short);
void party_monsters(int, int);
short party_objects(int);
void place_at(object *, int, int);
-void plant_gold(int, int, boolean);
+void plant_gold(short, short, boolean);
void play_level(void);
-void player_init(void);
void potion_heal(int);
int pr_com_id(int);
int pr_motion_char(int);
void print_stats(int);
void put_amulet(void);
-void put_door(room *, short, short *, short *);
void put_gold(void);
-void put_m_at(int, int, object *);
+void put_m_at(short, short, object *);
void put_mons(void);
void put_objects(void);
void put_on_ring(void);
@@ -650,15 +622,10 @@ void put_stairs(void);
void quaff(void);
void quit(boolean);
int r_index(const char *, int, boolean);
-void r_read(FILE *, char *, int);
-void r_write(FILE *, const char *, int);
void rand_around(short, short *, short *);
int rand_percent(int);
void rand_place(object *);
-void read_pack(object *, FILE *, boolean);
void read_scroll(void);
-void read_string(char *, FILE *, size_t);
-void recursive_deadend(short, const short *, short, short);
boolean reg_move(void);
void relight(void);
void remessage(short);
@@ -673,12 +640,7 @@ void rogue_hit(object *, boolean);
int rogue_is_around(int, int);
long rrandom(void);
void rust(object *);
-void rw_dungeon(FILE *, boolean);
-void rw_id(struct id *, FILE *, int, boolean);
-void rw_rooms(FILE *, boolean);
void s_con_mon(object *);
-int same_col(int, int);
-int same_row(int, int);
void save_game(void);
void save_into_file(const char *);
void save_screen(void);
@@ -695,21 +657,15 @@ void sound_bell(void);
void special_hit(object *);
void srrandom(int);
void start_window(void);
-void steal_gold(object *);
-void steal_item(object *);
-void sting(object *);
void stop_window(void);
void take_a_nap(void);
void take_from_pack(object *, object *);
void take_off(void);
void tele(void);
-void tele_away(object *);
void throw(void);
boolean throw_at_monster(object *, object *);
-int to_hit(const object *);
short trap_at(int, int);
-void trap_player(int, int);
-boolean try_to_cough(short, short, object *);
+void trap_player(short, short);
void turn_passage(short, boolean);
void un_put_on(object *);
void unblind(void);
@@ -724,16 +680,12 @@ void wait_for_ack(void);
void wake_room(short, boolean, short, short);
void wake_up(object *);
void wanderer(void);
-void wdrain_life(object *);
void wear(void);
void wield(void);
void win(void) __attribute__((__noreturn__));
void wizardize(void);
-void write_pack(const object *, FILE *);
-void write_string(char *, FILE *);
long xxx(boolean);
void xxxx(char *, short);
-void zap_monster(object *, unsigned short);
void zapp(void);
object *add_to_pack(object *, object *, int);
struct id *get_id_table(const object *);