*** angband.ori\src/cmd3.c	Thu Sep  4 07:17:52 1997
--- angband\src/cmd3.c	Wed Dec 17 19:01:06 1997
***************
*** 126,132 ****
  /*
   * The "wearable" tester
   */
! static bool item_tester_hook_wear(object_type *o_ptr)
  {
  	/* Check for a usable slot */
  	if (wield_slot(o_ptr) >= INVEN_WIELD) return (TRUE);
--- 126,135 ----
  /*
   * The "wearable" tester
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_hook_wear(object_type *o_ptr)
  {
  	/* Check for a usable slot */
  	if (wield_slot(o_ptr) >= INVEN_WIELD) return (TRUE);
***************
*** 692,698 ****
  /*
   * An "item_tester_hook" for refilling lanterns
   */
! static bool item_tester_refill_lantern(object_type *o_ptr)
  {
  	/* Flasks of oil are okay */
  	if (o_ptr->tval == TV_FLASK) return (TRUE);
--- 695,704 ----
  /*
   * An "item_tester_hook" for refilling lanterns
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_refill_lantern(object_type *o_ptr)
  {
  	/* Flasks of oil are okay */
  	if (o_ptr->tval == TV_FLASK) return (TRUE);
***************
*** 784,790 ****
  /*
   * An "item_tester_hook" for refilling torches
   */
! static bool item_tester_refill_torch(object_type *o_ptr)
  {
  	/* Torches are okay */
  	if ((o_ptr->tval == TV_LITE) &&
--- 790,799 ----
  /*
   * An "item_tester_hook" for refilling torches
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_refill_torch(object_type *o_ptr)
  {
  	/* Torches are okay */
  	if ((o_ptr->tval == TV_LITE) &&
***************
*** 1171,1177 ****
   * We use "u" to point to array of monster indexes,
   * and "v" to select the type of sorting to perform on "u".
   */
! static bool ang_sort_comp_hook(vptr u, vptr v, int a, int b)
  {
  	u16b *who = (u16b*)(u);
  
--- 1180,1189 ----
   * We use "u" to point to array of monster indexes,
   * and "v" to select the type of sorting to perform on "u".
   */
! #ifndef USE_286
! static
! #endif
! bool ang_sort_comp_hook(vptr u, vptr v, int a, int b)
  {
  	u16b *who = (u16b*)(u);
  
***************
*** 1246,1252 ****
   * We use "u" to point to array of monster indexes,
   * and "v" to select the type of sorting to perform.
   */
! static void ang_sort_swap_hook(vptr u, vptr v, int a, int b)
  {
  	u16b *who = (u16b*)(u);
  
--- 1258,1267 ----
   * We use "u" to point to array of monster indexes,
   * and "v" to select the type of sorting to perform.
   */
! #ifndef USE_286
! static
! #endif
! void ang_sort_swap_hook(vptr u, vptr v, int a, int b)
  {
  	u16b *who = (u16b*)(u);
  
*** angband.ori\src/cmd6.c	Thu Sep  4 07:17:52 1997
--- angband\src/cmd6.c	Wed Dec 17 19:01:50 1997
***************
*** 2666,2672 ****
  /*
   * Hook to determine if an object is activatable
   */
! static bool item_tester_hook_activate(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  
--- 2666,2675 ----
  /*
   * Hook to determine if an object is activatable
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_hook_activate(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  
*** angband.ori\src/files.c	Fri Sep  5 10:31:14 1997
--- angband\src/files.c	Wed Dec 17 19:05:02 1997
***************
*** 3784,3790 ****
   *
   * Actually suspend the game, and then resume cleanly
   */
! static void handle_signal_suspend(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
--- 3784,3793 ----
   *
   * Actually suspend the game, and then resume cleanly
   */
! #ifndef USE_286
! static
! #endif
! void handle_signal_suspend(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
***************
*** 3830,3836 ****
   * To prevent messy accidents, we should reset this global variable
   * whenever the user enters a keypress, or something like that.
   */
! static void handle_signal_simple(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
--- 3833,3842 ----
   * To prevent messy accidents, we should reset this global variable
   * whenever the user enters a keypress, or something like that.
   */
! #ifndef USE_286
! static
! #endif
! void handle_signal_simple(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
***************
*** 3910,3916 ****
  /*
   * Handle signal -- abort, kill, etc
   */
! static void handle_signal_abort(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
--- 3916,3925 ----
  /*
   * Handle signal -- abort, kill, etc
   */
! #ifndef USE_286
! static
! #endif
! void handle_signal_abort(int sig)
  {
  	/* Disable handler */
  	(void)signal(sig, SIG_IGN);
*** angband.ori\src/generate.c	Wed Sep  3 08:57:34 1997
--- angband\src/generate.c	Wed Dec 17 19:06:36 1997
***************
*** 1613,1619 ****
  /*
   * Helper function for "monster nest (jelly)"
   */
! static bool vault_aux_jelly(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1613,1622 ----
  /*
   * Helper function for "monster nest (jelly)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_jelly(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1631,1637 ****
  /*
   * Helper function for "monster nest (animal)"
   */
! static bool vault_aux_animal(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1634,1643 ----
  /*
   * Helper function for "monster nest (animal)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_animal(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1649,1655 ****
  /*
   * Helper function for "monster nest (undead)"
   */
! static bool vault_aux_undead(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1655,1664 ----
  /*
   * Helper function for "monster nest (undead)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_undead(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1667,1673 ****
  /*
   * Helper function for "monster pit (orc)"
   */
! static bool vault_aux_orc(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1676,1685 ----
  /*
   * Helper function for "monster pit (orc)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_orc(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1685,1691 ****
  /*
   * Helper function for "monster pit (troll)"
   */
! static bool vault_aux_troll(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1697,1706 ----
  /*
   * Helper function for "monster pit (troll)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_troll(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1703,1709 ****
  /*
   * Helper function for "monster pit (giant)"
   */
! static bool vault_aux_giant(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1718,1727 ----
  /*
   * Helper function for "monster pit (giant)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_giant(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1727,1733 ****
  /*
   * Helper function for "monster pit (dragon)"
   */
! static bool vault_aux_dragon(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1745,1754 ----
  /*
   * Helper function for "monster pit (dragon)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_dragon(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
***************
*** 1748,1754 ****
  /*
   * Helper function for "monster pit (demon)"
   */
! static bool vault_aux_demon(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1769,1778 ----
  /*
   * Helper function for "monster pit (demon)"
   */
! #ifndef USE_286
! static
! #endif
! bool vault_aux_demon(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
*** angband.ori\src/main.c	Wed Sep  3 08:57:34 1997
--- angband\src/main.c	Wed Dec 17 18:57:12 1997
***************
*** 54,60 ****
  /*
   * Set the stack size and overlay buffer (see main-286.c")
   */
! #ifdef USE_286
  # include <dos.h>
  extern unsigned _stklen = 32768U;
  extern unsigned _ovrbuffer = 0x1500;
--- 54,60 ----
  /*
   * Set the stack size and overlay buffer (see main-286.c")
   */
! #if defined(USE_286) && !defined(USE_WAT)
  # include <dos.h>
  extern unsigned _stklen = 32768U;
  extern unsigned _ovrbuffer = 0x1500;
***************
*** 248,254 ****
  	argv0 = argv[0];
  
  
! #ifdef USE_286
  	/* Attempt to use XMS (or EMS) memory for swap space */
  	if (_OvrInitExt(0L, 0L))
  	{
--- 248,254 ----
  	argv0 = argv[0];
  
  
! #if defined(USE_286) && !defined(USE_WAT)
  	/* Attempt to use XMS (or EMS) memory for swap space */
  	if (_OvrInitExt(0L, 0L))
  	{
*** angband.ori\src/monster2.c	Wed Sep  3 08:57:34 1997
--- angband\src/monster2.c	Wed Dec 17 19:07:42 1997
***************
*** 1630,1636 ****
  /*
   * Hack -- help pick an escort type
   */
! static bool place_monster_okay(int r_idx)
  {
  	monster_race *r_ptr = &r_info[place_monster_idx];
  
--- 1630,1639 ----
  /*
   * Hack -- help pick an escort type
   */
! #ifndef USE_286
! static
! #endif
! bool place_monster_okay(int r_idx)
  {
  	monster_race *r_ptr = &r_info[place_monster_idx];
  
***************
*** 1881,1887 ****
  /*
   * Hack -- help decide if a monster race is "okay" to summon
   */
! static bool summon_specific_okay(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
--- 1884,1893 ----
  /*
   * Hack -- help decide if a monster race is "okay" to summon
   */
! #ifndef USE_286
! static
! #endif
! bool summon_specific_okay(int r_idx)
  {
  	monster_race *r_ptr = &r_info[r_idx];
  
*** angband.ori\src/object2.c	Fri Sep  5 10:31:46 1997
--- angband\src/object2.c	Wed Dec 17 19:08:10 1997
***************
*** 3275,3281 ****
  /*
   * Hack -- determine if a template is "good"
   */
! static bool kind_is_good(int k_idx)
  {
  	object_kind *k_ptr = &k_info[k_idx];
  
--- 3275,3284 ----
  /*
   * Hack -- determine if a template is "good"
   */
! #ifndef USE_286
! static
! #endif
! bool kind_is_good(int k_idx)
  {
  	object_kind *k_ptr = &k_info[k_idx];
  
*** angband.ori\src/spells1.c	Thu Sep  4 07:17:54 1997
--- angband\src/spells1.c	Wed Dec 17 19:09:12 1997
***************
*** 601,607 ****
  /*
   * Melt something
   */
! static int set_acid_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_acid(o_ptr)) return (FALSE);
--- 601,610 ----
  /*
   * Melt something
   */
! #ifndef USE_286
! static
! #endif
! int set_acid_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_acid(o_ptr)) return (FALSE);
***************
*** 614,620 ****
  /*
   * Electrical damage
   */
! static int set_elec_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_elec(o_ptr)) return (FALSE);
--- 617,626 ----
  /*
   * Electrical damage
   */
! #ifndef USE_286
! static
! #endif
! int set_elec_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_elec(o_ptr)) return (FALSE);
***************
*** 627,633 ****
  /*
   * Burn something
   */
! static int set_fire_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_fire(o_ptr)) return (FALSE);
--- 633,642 ----
  /*
   * Burn something
   */
! #ifndef USE_286
! static
! #endif
! int set_fire_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_fire(o_ptr)) return (FALSE);
***************
*** 640,646 ****
  /*
   * Freeze things
   */
! static int set_cold_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_cold(o_ptr)) return (FALSE);
--- 649,658 ----
  /*
   * Freeze things
   */
! #ifndef USE_286
! static
! #endif
! int set_cold_destroy(object_type *o_ptr)
  {
  	u32b f1, f2, f3;
  	if (!hates_cold(o_ptr)) return (FALSE);
*** angband.ori\src/spells2.c	Thu Sep  4 07:17:54 1997
--- angband\src/spells2.c	Wed Dec 17 19:09:54 1997
***************
*** 1523,1529 ****
  /*
   * Hook to specify "weapon"
   */
! static bool item_tester_hook_weapon(object_type *o_ptr)
  {
  	switch (o_ptr->tval)
  	{
--- 1523,1532 ----
  /*
   * Hook to specify "weapon"
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_hook_weapon(object_type *o_ptr)
  {
  	switch (o_ptr->tval)
  	{
***************
*** 1547,1553 ****
  /*
   * Hook to specify "armour"
   */
! static bool item_tester_hook_armour(object_type *o_ptr)
  {
  	switch (o_ptr->tval)
  	{
--- 1550,1559 ----
  /*
   * Hook to specify "armour"
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_hook_armour(object_type *o_ptr)
  {
  	switch (o_ptr->tval)
  	{
***************
*** 1938,1944 ****
  /*
   * Hook for "get_item()".  Determine if something is rechargable.
   */
! static bool item_tester_hook_recharge(object_type *o_ptr)
  {
  	/* Recharge staffs */
  	if (o_ptr->tval == TV_STAFF) return (TRUE);
--- 1944,1953 ----
  /*
   * Hook for "get_item()".  Determine if something is rechargable.
   */
! #ifndef USE_286
! static
! #endif
! bool item_tester_hook_recharge(object_type *o_ptr)
  {
  	/* Recharge staffs */
  	if (o_ptr->tval == TV_STAFF) return (TRUE);
*** angband.ori\src/store.c	Thu Sep  4 07:17:54 1997
--- angband\src/store.c	Wed Dec 17 19:11:46 1997
***************
*** 692,698 ****
   *
   * Note that a shop-keeper must refuse to buy "worthless" items
   */
! static bool store_will_buy(object_type *o_ptr)
  {
  	/* Hack -- The Home is simple */
  	if (store_num == 7) return (TRUE);
--- 692,701 ----
   *
   * Note that a shop-keeper must refuse to buy "worthless" items
   */
! #ifndef USE_286
! static
! #endif
! bool store_will_buy(object_type *o_ptr)
  {
  	/* Hack -- The Home is simple */
  	if (store_num == 7) return (TRUE);
*** angband.ori\src/variable.c	Fri Sep  5 10:31:52 1997
--- angband\src/variable.c	Sun Dec 14 17:56:38 1997
***************
*** 10,15 ****
--- 10,16 ----
  
  #include "angband.h"
  
+ #if !defined(USE_286) || defined(VARIABLE_PART1)
  
  /*
   * Hack -- Link a copyright message into the executable
***************
*** 345,350 ****
--- 346,354 ----
   */
  s16b cave_o_idx[DUNGEON_HGT][DUNGEON_WID];
  
+ #endif
+ #if !defined(USE_286) || defined(VARIABLE_PART2)
+ 
  /*
   * The array of cave grid monster indexes
   *
***************
*** 631,634 ****
   * Hack -- function hook to restrict "get_obj_num_prep()" function
   */
  bool (*get_obj_num_hook)(int k_idx);
! 
--- 634,637 ----
   * Hack -- function hook to restrict "get_obj_num_prep()" function
   */
  bool (*get_obj_num_hook)(int k_idx);
! #endif
*** angband.ori\src/xtra2.c	Thu Sep  4 07:17:56 1997
--- angband\src/xtra2.c	Wed Dec 17 19:13:58 1997
***************
*** 2536,2542 ****
   * We use "u" and "v" to point to arrays of "x" and "y" positions,
   * and sort the arrays by double-distance to the player.
   */
! static bool ang_sort_comp_distance(vptr u, vptr v, int a, int b)
  {
  	int py = p_ptr->py;
  	int px = p_ptr->px;
--- 2536,2545 ----
   * We use "u" and "v" to point to arrays of "x" and "y" positions,
   * and sort the arrays by double-distance to the player.
   */
! #ifndef USE_286
! static
! #endif
! bool ang_sort_comp_distance(vptr u, vptr v, int a, int b)
  {
  	int py = p_ptr->py;
  	int px = p_ptr->px;
***************
*** 2571,2577 ****
   * We use "u" and "v" to point to arrays of "x" and "y" positions,
   * and sort the arrays by distance to the player.
   */
! static void ang_sort_swap_distance(vptr u, vptr v, int a, int b)
  {
  	byte *x = (byte*)(u);
  	byte *y = (byte*)(v);
--- 2574,2583 ----
   * We use "u" and "v" to point to arrays of "x" and "y" positions,
   * and sort the arrays by distance to the player.
   */
! #ifndef USE_286
! static
! #endif
! void ang_sort_swap_distance(vptr u, vptr v, int a, int b)
  {
  	byte *x = (byte*)(u);
  	byte *y = (byte*)(v);