extern bool inkey_scan;
extern bool inkey_flag;
extern bool get_com_no_macros;
-extern s16b coin_type;
+extern OBJECT_SUBTYPE_VALUE coin_type;
extern bool opening_chest;
extern bool shimmer_monsters;
extern bool shimmer_objects;
extern int battle_odds;
extern int kakekin;
extern u32b mon_odds[4];
-extern int pet_t_m_idx;
-extern int riding_t_m_idx;
+extern MONSTER_IDX pet_t_m_idx;
+extern MONSTER_IDX riding_t_m_idx;
extern s16b kubi_r_idx[MAX_KUBI];
extern s16b today_mon;
extern bool write_level;
extern FEAT_IDX feat_swamp;
extern FEAT_IDX feat_undetected;
-extern IDX dungeon_type;
+extern DUNGEON_IDX dungeon_type;
extern DEPTH *max_dlv;
extern FEAT_IDX feat_wall_outer;
extern FEAT_IDX feat_wall_inner;
extern FEAT_IDX feat_wall_solid;
extern FEAT_IDX floor_type[100], fill_type[100];
extern bool now_damaged;
-extern s16b now_message;
+extern COMMAND_CODE now_message;
extern bool use_menu;
/* autopick.c */
extern void forget_flow(void);
extern void update_flow(void);
extern void update_smell(void);
-extern void map_area(int range);
+extern void map_area(POSITION range);
extern void wiz_lite(bool ninja);
extern void wiz_dark(void);
extern void cave_set_feat(POSITION y, POSITION x, IDX feat);
extern void do_cmd_fire(void);
extern void do_cmd_fire_aux(int item, object_type *j_ptr);
extern void do_cmd_throw(void);
-extern bool do_cmd_throw_aux(int mult, bool boomerang, int shuriken);
+extern bool do_cmd_throw_aux(int mult, bool boomerang, OBJECT_IDX shuriken);
#ifdef TRAVEL
extern void do_cmd_travel(void);
#endif
/* do-spell.c */
extern void stop_singing(void);
-extern cptr do_spell(int realm, int spell, int mode);
+extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, int mode);
/* dungeon.c */
extern void leave_quest_check(void);
extern void delete_monster(POSITION y, POSITION x);
extern void compact_monsters(int size);
extern void wipe_m_list(void);
-extern s16b m_pop(void);
+extern MONSTER_IDX m_pop(void);
extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2);
extern MONRACE_IDX get_mon_num(DEPTH level);
extern void monster_desc(char *desc, monster_type *m_ptr, int mode);
extern void sanity_blast(monster_type *m_ptr, bool necro);
extern void update_mon(MONSTER_IDX m_idx, bool full);
extern void update_monsters(bool full);
-extern bool place_monster_aux(IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode);
+extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode);
extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode);
extern bool alloc_horde(POSITION y, POSITION x);
extern bool alloc_guardian(bool def_val);
extern bool alloc_monster(int dis, u32b mode);
-extern bool summon_specific(int who, int y1, int x1, int lev, int type, u32b mode);
-extern bool summon_named_creature (int who, int oy, int ox, MONRACE_IDX r_idx, u32b mode);
+extern bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode);
+extern bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode);
extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, u32b mode);
extern void update_smart_learn(MONSTER_IDX m_idx, int what);
extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx);
extern cptr item_activation(object_type *o_ptr);
extern bool screen_object(object_type *o_ptr, u32b mode);
extern char index_to_label(int i);
-extern s16b label_to_inven(int c);
-extern s16b label_to_equip(int c);
+extern INVENTORY_IDX label_to_inven(int c);
+extern INVENTORY_IDX label_to_equip(int c);
extern s16b wield_slot(object_type *o_ptr);
extern cptr mention_use(int i);
extern cptr describe_use(int i);
extern int show_equip(int target_item);
extern void toggle_inven_equip(void);
extern bool can_get_item(void);
-extern bool get_item(int *cp, cptr pmt, cptr str, int mode);
+extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode);
/* object2.c */
extern void excise_object_idx(int o_idx);
extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
extern IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval);
extern void object_wipe(object_type *o_ptr);
-extern void object_prep(object_type *o_ptr, IDX k_idx);
+extern void object_prep(object_type *o_ptr, OBJECT_IDX k_idx);
extern void object_copy(object_type *o_ptr, object_type *j_ptr);
extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode);
extern bool make_object(object_type *j_ptr, BIT_FLAGS mode);
/* spells1.c */
extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2);
-extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ);
+extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ);
extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ);
extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg);
/* spells2.c */
extern void message_pain(MONSTER_IDX m_idx, int dam);
extern void self_knowledge(void);
-extern bool detect_traps(int range, bool known);
-extern bool detect_doors(int range);
-extern bool detect_stairs(int range);
-extern bool detect_treasure(int range);
-extern bool detect_objects_gold(int range);
-extern bool detect_objects_normal(int range);
-extern bool detect_objects_magic(int range);
-extern bool detect_monsters_normal(int range);
-extern bool detect_monsters_invis(int range);
-extern bool detect_monsters_evil(int range);
-extern bool detect_monsters_xxx(int range, u32b match_flag);
-extern bool detect_monsters_string(int range, cptr);
-extern bool detect_monsters_nonliving(int range);
-extern bool detect_monsters_mind(int range);
-extern bool detect_all(int range);
+extern bool detect_traps(POSITION range, bool known);
+extern bool detect_doors(POSITION range);
+extern bool detect_stairs(POSITION range);
+extern bool detect_treasure(POSITION range);
+extern bool detect_objects_gold(POSITION range);
+extern bool detect_objects_normal(POSITION range);
+extern bool detect_objects_magic(POSITION range);
+extern bool detect_monsters_normal(POSITION range);
+extern bool detect_monsters_invis(POSITION range);
+extern bool detect_monsters_evil(POSITION range);
+extern bool detect_monsters_xxx(POSITION range, u32b match_flag);
+extern bool detect_monsters_string(POSITION range, cptr);
+extern bool detect_monsters_nonliving(POSITION range);
+extern bool detect_monsters_mind(POSITION range);
+extern bool detect_all(POSITION range);
extern bool wall_stone(void);
extern bool speed_monsters(void);
extern bool slow_monsters(int power);
extern bool sleep_monsters(int power);
-extern void aggravate_monsters(int who);
+extern void aggravate_monsters(MONSTER_IDX who);
extern bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, cptr spell_name);
extern bool symbol_genocide(int power, bool player_cast);
extern bool mass_genocide(int power, bool player_cast);
extern bool animate_dead(int who, int y, int x);
extern bool sleep_monsters_touch(void);
extern bool activate_ty_curse(bool stop_ty, int *count);
-extern int activate_hi_summon(int y, int x, bool can_pet);
-extern int summon_cyber(int who, int y, int x);
+extern int activate_hi_summon(POSITION y, POSITION x, bool can_pet);
+extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x);
extern void wall_breaker(void);
extern bool confuse_monsters(int dam);
extern bool charm_monsters(int dam);
extern void teleport_player_to(POSITION ny, POSITION nx, u32b mode);
extern void teleport_away_followable(MONSTER_IDX m_idx);
extern void teleport_level(MONSTER_IDX m_idx);
-extern IDX choose_dungeon(cptr note, int y, int x);
-extern bool recall_player(int turns);
+extern DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x);
+extern bool recall_player(TIME_EFFECT turns);
extern bool word_of_recall(void);
extern bool reset_recall(void);
extern bool apply_disenchant(int mode);
extern int mod_spell_chance_2(int chance);
extern s16b spell_chance(int spell,int realm);
extern bool spell_okay(int spell, bool learned, bool study_pray, int realm);
-extern void print_spells(int target_spell, int *spells, int num, TERM_POSITION y, TERM_POSITION x, int realm);
+extern void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_POSITION y, TERM_POSITION x, REALM_IDX realm);
extern bool hates_acid(object_type *o_ptr);
extern bool hates_elec(object_type *o_ptr);
extern bool hates_fire(object_type *o_ptr);
extern bool curse_weapon_object(bool force, object_type *o_ptr);
extern bool curse_weapon(bool force, int slot);
extern bool brand_bolts(void);
-extern bool polymorph_monster(int y, int x);
+extern bool polymorph_monster(POSITION y, POSITION x);
extern bool dimension_door(void);
extern bool mirror_tunnel(void);
extern bool summon_kin_player(int level, int y, int x, u32b mode);
extern errr macro_add(cptr pat, cptr act);
extern sint macro_find_exact(cptr pat);
extern char inkey(void);
-extern cptr quark_str(s16b num);
+extern cptr quark_str(STR_OFFSET num);
extern void quark_init(void);
extern s16b quark_add(cptr str);
extern s32b message_num(void);
extern bool get_check(cptr prompt);
extern bool get_check_strict(cptr prompt, int mode);
extern bool get_com(cptr prompt, char *command, bool z_escape);
-extern s16b get_quantity(cptr prompt, int max);
+extern s16b get_quantity(cptr prompt, COMMAND_CODE max);
extern void pause_line(int row);
extern void request_command(int shopping);
extern bool is_a_vowel(int ch);
#ifdef ALLOW_REPEAT /* TNB */
/* util.c */
-extern void repeat_push(SPELL_IDX what);
-extern bool repeat_pull(SPELL_IDX *what);
+extern void repeat_push(COMMAND_CODE what);
+extern bool repeat_pull(COMMAND_CODE *what);
extern void repeat_check(void);
#endif /* ALLOW_REPEAT -- TNB */
/* object1.c */
extern int scan_floor(int *items, int y, int x, int mode);
extern int show_floor(int target_item, int y, int x, int *min_width);
-extern bool get_item_floor(int *cp, cptr pmt, cptr str, int mode);
+extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode);
extern void py_pickup_floor(bool pickup);
/* variable.c */
extern bool object_allow_two_hands_wielding(object_type *o_ptr);
/* wild.c */
-extern void set_floor_and_wall(byte type);
+extern void set_floor_and_wall(DUNGEON_IDX type);
extern void wilderness_gen(void);
extern void wilderness_gen_small(void);
extern errr init_wilderness(void);