36 files changed, 99 insertions, 3313 deletions
diff --git a/BUGS.txt b/BUGS.txt
new file mode 100644
index 00000000..ddac58c3
--- /dev/null
+++ b/BUGS.txt
@@ -0,0 +1,5 @@
+Known Bugs:
+===========
+
+- If you save the game during the Thieves Quest in Bree, it will not be able to load.
+- Under Linux the X11 front-end does not work properly when NumLock is on.
diff --git a/building.txt b/README.txt
index 463d648c..463d648c 100644
--- a/building.txt
+++ b/README.txt
diff --git a/changes.txt b/changes.txt
index 9e90e2ec..e9ed9593 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,26 @@
+T.o.M.E 2.3.9 (ah)
+
+User Interface:
+
+- Always display list of selectable objects immediately
+  instead of requiring user to press '*'.
+- Fix display issues with extremely wide terminals.
+- Automatizer: Fix memory corruption issues.
+- Remove obsolete and pointless options.
+
+Game:
+
+- Items are now immediately pseudo-identified upon pickup.
+- Psycometry now always Identifies regardless of level.
+- Remove the need to instantly leave for a certain quest. Lots
+  of players would get caught out by this.
+- A few Mindcraft powers now scale with skill level. (Credit
+  for these goes to Lord Estraven.)
+- "Far reaching attack" now works for *all* polearms.
+- Fixes and tweaks for Thaumaturgy to make view/area spells less
+  overpowered and to make bolt/ball spells more useful. (Credit
+  goes to Lord Estraven.)
+
 T.o.M.E 2.3.8 (ah)
 
 Game:
diff --git a/lib/help/command.txt b/lib/help/command.txt
index 0beffd33..6616c252 100644
--- a/lib/help/command.txt
+++ b/lib/help/command.txt
@@ -572,12 +572,11 @@ for a quantity will convert any "letters" into the maximal legal value.
         wilderness map.  Going up a staircase will take you to a new dungeon
         level unless you are at the first level of the dungeon, in which case
         you will return to the surface.  Note that whenever you leave a dungeon
-        level, you will never find it again, unless the "permanent_levels" 
-        option is set or the level contains a dungeon town.  This means that
-        for all intents and purposes, any objects on that level are destroyed.
-        This includes unknown artifacts unless the "Create characters in
-        preserve mode" option was set when your character was created, in which
-        case the artifacts may show up again later.
+        level, you will never find it again, unless the level contains a dungeon
+        town.  This means that for all intents and purposes, any objects on that
+        level are destroyed. This includes unknown artifacts unless the "Create
+        characters in preserve mode" option was set when your character was
+        created, in which case the artifacts may show up again later.
 ~~~~~77
 [[[[[GGo down staircase (>)]
         Descends a down staircase you are standing on.  There are always
diff --git a/lib/help/option.txt b/lib/help/option.txt
index 33e0ce9e..6fd3b413 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -51,10 +51,6 @@ can also be viewed from the option menu while playing, but not changed then.
     character who is above average (but not great) in all stats. Unused points
     convert into starting gold for the player.
 
-#####GGenerate persistent dungeons    [permanent_levels]
-    Setting this option means that level 1 of the dungeon will always have
-    the same dungeon map each time you visit it (like the Nethack dungeon).
-
 #####GAlways generate very unusual rooms    [ironman_rooms]
     Tries to place a special room or vault on every dungeon level. Very fun,
     but extremely deadly - imagine that Greater Checkerboard Vault with Lokkak
@@ -181,11 +177,6 @@ off at will during the course of the game.
 #####GAudible bell (on errors, etc)    [ring_bell]
     Attempt to make a "bell" noise when various errors occur.
 
-#####GUse color if possible (slow)    [use_color]
-    This option enables the software support for colour.  Since this makes
-    the game slower, you should always disable this option if you are using
-    a machine which is not capable of using colours.
-
 ~~~~~09|Options|Disturbance
 #####R=== Option Set 2 -- Disturbance ===
 
@@ -382,10 +373,6 @@ off at will during the course of the game.
 #####GMonsters chase current location (v.slow)    [flow_by_sound]
     Allow monsters to make paths to the player when they are nearby.  This
     option is extremely slow, but can produce viciously smart monsters.
-
-#####GMonsters chase recent locations (v.slow)    [flow_by_smell]
-    As above, but also allow monsters to take advantage of "old" trails
-    that you may have left in the dungeon.
 ~~~~~3
 #####GUse special symbols for the player char   [player_symbols]
     If this option has been compiled in, it allows you to display your
@@ -508,10 +495,6 @@ off at will during the course of the game.
     displayed by the game.  This will give you maximal information, but
     may slow down the game somewhat.
 
-#####GCompress messages in savefiles    [compress_savefile]
-    Compress the savefile, by only saving the most recent messages that
-    the player has received.  This can cut the size of the savefile by a
-    drastic amount, but will result in the loss of message information.
 ~~~~~2
 #####GHilite the player with the cursor    [hilite_player]
     Place the visible cursor on the player.  This looks fine on some Unix
diff --git a/lib/module.lua b/lib/module.lua
index 143743b5..edbaa34b 100644
--- a/lib/module.lua
+++ b/lib/module.lua
@@ -1,7 +1,7 @@
 add_module
 {
 	["name"]    = "ToME",
-	["version"] = { 2, 3, 8 },
+	["version"] = { 2, 3, 9 },
 	["author"]  = { "DarkGod", "darkgod@t-o-m-e.net" },
 	["desc"] = {
 		"The Tales of Middle-earth, the standard and official game.",
diff --git a/lib/scpt/mkeys.lua b/lib/scpt/mkeys.lua
index 15e23546..07105c64 100644
--- a/lib/scpt/mkeys.lua
+++ b/lib/scpt/mkeys.lua
@@ -66,7 +66,7 @@ add_mkey
 	["mkey"]	= 102,
 	["fct"]	 = function()
 			local weapon = get_object(INVEN_WIELD);
-			if weapon.tval == TV_POLEARM and (weapon.sval == SV_HALBERD or weapon.sval == SV_PIKE or weapon.sval == SV_HEAVY_LANCE or weapon.sval == SV_LANCE) then
+			if weapon.tval == TV_POLEARM then
 			else
 				msg_print("You will need a long polearm for this!")
 				return
diff --git a/src/birth.c b/src/birth.c
index b3b61e3c..fa74c5e2 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -2387,7 +2387,6 @@ static bool player_birth_aux_ask()
 	 * the old one (player_type members), it would be less confusing
 	 * to handle birth-only options in a uniform fashion,the above and
 	 * the following:
-	 * permanent_levels,
 	 * ironman_rooms,
 	 * joke_monsters,
 	 * always_small_level, and
@@ -2395,16 +2394,6 @@ static bool player_birth_aux_ask()
 	 */
 
 
-	/* Set dungeon seed */
-	if (permanent_levels)
-	{
-		seed_dungeon = randint(0x10000000);
-	}
-	else
-	{
-		seed_dungeon = 0;
-	}
-
 	/* Set the recall dungeon accordingly */
 	call_lua("get_module_info", "(s)", "d", "base_dungeon", &tmp);
 	dungeon_type = tmp;
@@ -2432,7 +2421,7 @@ static bool player_birth_aux_ask()
 	/* Heino Vander Sanden and Jimmy De Laet */
 
 	call_lua("get_module_info", "(s)", "d", "rand_quest", &allow_quest);
-	if (!ironman_rooms && !permanent_levels && allow_quest)
+	if (!ironman_rooms && allow_quest)
 	{
 		if (do_quick_start)
 		{
@@ -3772,9 +3761,6 @@ bool begin_screen()
 savefile_try_again:
 	sel = 0;
 
-	/* Hack */
-	use_color = TRUE;
-
 	/* Grab the savefiles */
 	max = load_savefile_names();
 
diff --git a/src/cmd3.c b/src/cmd3.c
index 65f431f1..120d72f4 100644
--- a/src/cmd3.c
+++ b/src/cmd3.c
@@ -18,15 +18,6 @@
  */
 void do_cmd_inven(void)
 {
-#if 0
-	/* Broken */
-
-	int capacity_tester = 0;
-
-	int i = 0, j = 0;
-
-#endif
-
 	char out_val[160];
 
 
@@ -46,24 +37,6 @@ void do_cmd_inven(void)
 	/* Hack -- hide empty slots */
 	item_tester_full = FALSE;
 
-#if 0
-
-	/* Broken */
-
-	/* Extract the current weight (in tenth pounds) */
-	j = calc_total_weight();
-
-	/* Extract the "weight limit" (in tenth pounds) */
-	i = weight_limit();
-
-	capacity_tester = i + (i / 10) - 1;
-
-	strnfmt(out_val, 160,
-	        "Inventory: carrying %d.%d pounds (%d%% of capacity). Command: ",
-	        total_weight / 10, total_weight % 10,
-	        (total_weight * 100) / ((capacity_tester) / 2));
-
-#else
 
 	{
 		s32b total_weight = calc_total_weight();
@@ -74,8 +47,6 @@ void do_cmd_inven(void)
 		        (total_weight * 100) / ((weight_limit()) / 2));
 	}
 
-#endif
-
 	/* Get a command */
 	prt(out_val, 0, 0);
 
@@ -1574,10 +1545,6 @@ static void roff_top(int r_idx)
 	a1 = r_ptr->d_attr;
 	a2 = r_ptr->x_attr;
 
-	/* Hack -- fake monochrome */
-	if (!use_color) a1 = TERM_WHITE;
-	if (!use_color) a2 = TERM_WHITE;
-
 
 	/* Clear the top line */
 	Term_erase(0, 0, 255);
diff --git a/src/cmd4.c b/src/cmd4.c
index 462df88d..6575b162 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -919,7 +919,7 @@ static void do_cmd_options_win(void)
 			cptr s = angband_term_name[j];
 
 			/* Use color */
-			if (use_color && (j == x)) a = TERM_L_BLUE;
+			if ((j == x)) a = TERM_L_BLUE;
 
 			/* Window name, staggered, centered */
 			Term_putstr(35 + j * 5 - strlen(s) / 2, 2 + j % 2, -1, a, s);
@@ -933,7 +933,7 @@ static void do_cmd_options_win(void)
 			cptr str = window_flag_desc[i];
 
 			/* Use color */
-			if (use_color && (i == y)) a = TERM_L_BLUE;
+			if ((i == y)) a = TERM_L_BLUE;
 
 			/* Unused option */
 			if (!str) str = "(Unused option)";
@@ -949,7 +949,7 @@ static void do_cmd_options_win(void)
 				char c = '.';
 
 				/* Use color */
-				if (use_color && (i == y) && (j == x)) a = TERM_L_BLUE;
+				if ((i == y) && (j == x)) a = TERM_L_BLUE;
 
 				/* Active flag */
 				if (window_flag[j] & (1L << i)) c = 'X';
@@ -3112,9 +3112,6 @@ void do_cmd_load_screen(void)
 				if (hack[i] == buf[x]) a = i;
 			}
 
-			/* Hack -- fake monochrome */
-			if (!use_color) a = TERM_WHITE;
-
 			/* Put the attr/char */
 			Term_draw(x, y, a, c);
 		}
diff --git a/src/cmd7.c b/src/cmd7.c
index b6c20985..ed2d8293 100644
--- a/src/cmd7.c
+++ b/src/cmd7.c
@@ -606,7 +606,7 @@ void do_cmd_mindcraft(void)
 			/* Character Armour */
 		case 6:
 			{
-				set_shield(p_ptr->shield + plev, 50, 0, 0, 0);
+				set_shield(p_ptr->shield + plev, plev, 0, 0, 0);
 				if (plev > 14) set_oppose_acid(p_ptr->oppose_acid + plev);
 				if (plev > 19) set_oppose_fire(p_ptr->oppose_fire + plev);
 				if (plev > 24) set_oppose_cold(p_ptr->oppose_cold + plev);
@@ -619,15 +619,7 @@ void do_cmd_mindcraft(void)
 			/* Psychometry */
 		case 7:
 			{
-				if (plev < 40)
-				{
-					psychometry();
-				}
-				else
-				{
-					ident_spell();
-				}
-
+				ident_spell();
 				break;
 			}
 
@@ -669,11 +661,11 @@ void do_cmd_mindcraft(void)
 				if (!p_ptr->fast)
 				{
 					/* Haste */
-					(void)set_fast(b, 10);
+					(void)set_fast(b, plev / 5);
 				}
 				else
 				{
-					(void)set_fast(p_ptr->fast + b, 10);
+					(void)set_fast(p_ptr->fast + b, plev / 5);
 				}
 
 				break;
diff --git a/src/defines.h b/src/defines.h
index 33fc51c6..e434e461 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -37,8 +37,8 @@
  */
 
 #ifndef IS_CVS
-/*#define IS_CVS          " (ah)" */
 #define IS_CVS          " (ah)"
+/* #define IS_CVS          " (ah, git)" */
 #endif
 
 #define USER_PATH_VERSION "/2.3"
diff --git a/src/dungeon.c b/src/dungeon.c
index fca12173..26c27c78 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -154,8 +154,8 @@ byte value_check_aux2(object_type *o_ptr)
 	/* Good weapon bonuses */
 	if (o_ptr->to_h + o_ptr->to_d > 0) return (SENSE_GOOD_LIGHT);
 
-	/* No feeling */
-	return (SENSE_NONE);
+	/* Default to "average" */
+	return (SENSE_AVERAGE);
 }
 
 
@@ -239,7 +239,7 @@ static bool granted_resurrection(void)
 	return (FALSE);
 }
 
-byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic)
+static byte select_sense(object_type *o_ptr)
 {
 	/* Valid "tval" codes */
 	switch (o_ptr->tval)
@@ -266,7 +266,7 @@ byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic)
 	case TV_BOOMERANG:
 	case TV_TRAPKIT:
 		{
-			if (ok_combat) return 1;
+			return 1;
 			break;
 		}
 
@@ -278,14 +278,14 @@ byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic)
 	case TV_ROD:
 	case TV_ROD_MAIN:
 		{
-			if (ok_magic) return 2;
+			return 2;
 			break;
 		}
 
 		/* Dual use? */
 	case TV_DAEMON_BOOK:
 		{
-			if (ok_combat || ok_magic) return 1;
+			return 1;
 			break;
 		}
 	}
@@ -305,12 +305,11 @@ byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic)
  * they learn one form of ID or another, and because most magic items are
  * easy_know.
  */
-static void sense_inventory(void)
+void sense_inventory(void)
 {
 	int i, combat_lev, magic_lev;
 
 	bool heavy_combat, heavy_magic;
-	bool ok_combat, ok_magic;
 
 	byte feel;
 
@@ -324,14 +323,6 @@ static void sense_inventory(void)
 	/* No sensing when confused */
 	if (p_ptr->confused) return;
 
-	/* Can we pseudo id */
-#if 0
-
-	if (0 == rand_int(133 - get_skill_scale(SKILL_COMBAT, 130))) ok_combat = TRUE;
-	if (0 == rand_int(133 - get_skill_scale(SKILL_MAGIC, 130))) ok_magic = TRUE;
-
-#endif
-
 	/*
 	 * In Angband, the chance of pseudo-id uses two different formulae:
 	 *
@@ -360,23 +351,9 @@ static void sense_inventory(void)
 	/* The combat skill affects weapon/armour pseudo-ID */
 	combat_lev = get_skill(SKILL_COMBAT);
 
-	/* Use the fast formula */
-	ok_combat = (0 == rand_int(9000L / (combat_lev * combat_lev + 40)));
-
 	/* The magic skill affects magic item pseudo-ID */
 	magic_lev = get_skill(SKILL_MAGIC);
 
-	/*
-	 * Use the slow formula, because spellcasters have id spells
-	 *
-	 * Lowered the base value because V rangers are known to have
-	 * pretty useless pseudo-ID. This should make it ten times more often.
-	 */
-	ok_magic = (0 == rand_int(12000L / (magic_lev + 5)));
-
-	/* Both ID rolls failed */
-	if (!ok_combat && !ok_magic) return;
-
 	/* Higher skill levels give the player better sense of items */
 	heavy_combat = (combat_lev > 10) ? TRUE : FALSE;
 	heavy_magic = (magic_lev > 10) ? TRUE : FALSE;
@@ -394,20 +371,17 @@ static void sense_inventory(void)
 		/* Skip empty slots */
 		if (!o_ptr->k_idx) continue;
 
-		/* Valid "tval" codes */
-		okay = select_sense(o_ptr, ok_combat, ok_magic);
-
-		/* Skip non-sense machines */
-		if (!okay) continue;
-
 		/* We know about it already, do not tell us again */
 		if (o_ptr->ident & (IDENT_SENSE)) continue;
 
 		/* It is fully known, no information needed */
 		if (object_known_p(o_ptr)) continue;
 
-		/* Occasional failure on inventory items */
-		if ((i < INVEN_WIELD) && (0 != rand_int(5))) continue;
+		/* Valid "tval" codes */
+		okay = select_sense(o_ptr);
+
+		/* Skip non-sense machines */
+		if (!okay) continue;
 
 		/* Check for a feeling */
 		if (okay == 1)
@@ -422,9 +396,6 @@ static void sense_inventory(void)
 		/* Skip non-feelings */
 		if (feel == SENSE_NONE) continue;
 
-		/* Stop everything */
-		if (disturb_minor) disturb(0, 0);
-
 		/* Get an object description */
 		object_desc(o_name, o_ptr, FALSE, 0);
 
@@ -825,81 +796,6 @@ static void regen_monsters(void)
 
 
 /*
- * Forcibly pseudo-identify an object in the inventory
- * (or on the floor)
- */
-bool psychometry(void)
-{
-	int item;
-
-	object_type *o_ptr;
-
-	char o_name[80];
-
-	byte feel;
-
-	cptr q, s;
-
-
-	/* Get an item */
-	q = "Meditate on which item? ";
-	s = "You have nothing appropriate.";
-	if (!get_item(&item, q, s, (USE_EQUIP | USE_INVEN | USE_FLOOR))) return (FALSE);
-
-	/* Get the item (in the pack) */
-	if (item >= 0)
-	{
-		o_ptr = &p_ptr->inventory[item];
-	}
-
-	/* Get the item (on the floor) */
-	else
-	{
-		o_ptr = &o_list[0 - item];
-	}
-
-	/* It is fully known, no information needed */
-	if ((object_known_p(o_ptr)) || (o_ptr->ident & IDENT_SENSE))
-	{
-		msg_print("You cannot find out anything more about that.");
-		return (TRUE);
-	}
-
-	/* Check for a feeling */
-	feel = value_check_aux1_magic(o_ptr);
-	if (feel == SENSE_NONE) feel = value_check_aux1(o_ptr);
-
-	/* Get an object description */
-	object_desc(o_name, o_ptr, FALSE, 0);
-
-	/* Skip non-feelings */
-	if (!feel)
-	{
-		msg_format("You do not perceive anything unusual about the %s.", o_name);
-		return (TRUE);
-	}
-
-	msg_format("You feel that the %s %s %s...",
-	           o_name, ((o_ptr->number == 1) ? "is" : "are"), sense_desc[feel]);
-
-	/* We have "felt" it */
-	o_ptr->ident |= (IDENT_SENSE);
-
-	/* Set sense property */
-	o_ptr->sense = feel;
-
-	/* Combine / Reorder the pack (later) */
-	p_ptr->notice |= (PN_COMBINE | PN_REORDER);
-
-	/* Window stuff */
-	p_ptr->window |= (PW_INVEN | PW_EQUIP | PW_PLAYER);
-
-	/* Something happened */
-	return (TRUE);
-}
-
-
-/*
  * Does an object decay?
  *
  * Should belong to object1.c, renamed to object_decays() -- pelpel
@@ -1347,7 +1243,7 @@ static void process_world(void)
 
 		if ((randint(1000) < r_ptr->level - ((p_ptr->lev * 2) + get_skill(SKILL_SYMBIOTIC))))
 		{
-			msg_format("%s thinks you are not enough in symbiosis.",
+			msg_format("%s breaks free from hypnosis!",
 			           symbiote_name(TRUE));
 			carried_make_attack_normal(o_ptr->pval);
 		}
@@ -3239,12 +3135,6 @@ static void process_world(void)
 		p_ptr->window |= (PW_INVEN);
 	}
 
-	/* Feel the p_ptr->inventory */
-	if (dun_level || (!p_ptr->wild_mode))
-	{
-		sense_inventory();
-	}
-
 	/*** Process Objects ***/
 
 	/* Process objects */
@@ -5705,9 +5595,6 @@ void play_game(bool new_game)
 		/* Hack -- seed for flavors */
 		seed_flavor = rand_int(0x10000000);
 
-		/* Hack -- seed for town layout */
-		seed_town = rand_int(0x10000000);
-
 		/* Roll up a new character */
 		player_birth();
 
diff --git a/src/externs.h b/src/externs.h
index fbc11627..4022dace 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -122,8 +122,6 @@ extern bool character_saved;
 extern bool character_icky;
 extern bool character_xtra;
 extern u32b seed_flavor;
-extern u32b seed_town;
-extern u32b seed_dungeon;
 extern s16b command_cmd;
 extern s16b command_arg;
 extern s16b command_rep;
@@ -206,8 +204,6 @@ extern bool prompt_pickup_heavy;
 extern bool always_repeat;
 extern bool use_old_target;
 extern bool depth_in_feet;
-extern bool use_color;
-extern bool compress_savefile;
 extern bool hilite_player;
 extern bool ring_bell;
 extern bool find_ignore_stairs;
@@ -246,7 +242,6 @@ extern bool view_perma_grids;
 extern bool view_torch_grids;
 extern bool monster_lite;
 extern bool flow_by_sound;
-extern bool flow_by_smell;
 extern bool track_follow;
 extern bool track_target;
 extern bool stack_allow_items;
@@ -280,9 +275,6 @@ extern bool speak_unique;
 extern bool small_levels;
 extern bool empty_levels;
 extern bool always_small_level;
-#if 0 /* It's controlled by insanity -- pelpel */
-extern bool flavored_attacks;
-#endif
 extern bool player_symbols;
 extern byte hitpoint_warn;
 extern byte delay_factor;
@@ -545,7 +537,6 @@ extern s16b *max_dlv;
 extern u32b total_bounties;
 extern s16b doppleganger;
 extern bool generate_encounter;
-extern bool permanent_levels;
 extern bool autoroll;
 extern bool point_based;
 extern bool maximize, preserve, special_lvls, ironman_rooms;
@@ -887,9 +878,8 @@ extern byte value_check_aux1(object_type *o_ptr);
 extern byte value_check_aux1_magic(object_type *o_ptr);
 extern byte value_check_aux2(object_type *o_ptr);
 extern byte value_check_aux2_magic(object_type *o_ptr);
-extern byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic);
 extern void play_game(bool new_game);
-extern bool psychometry(void);
+extern void sense_inventory();
 
 /* files.c */
 extern void html_screenshot(cptr name);
diff --git a/src/files.c b/src/files.c
index 32c991fd..95237b16 100644
--- a/src/files.c
+++ b/src/files.c
@@ -2636,9 +2636,6 @@ static void display_player_ben_one(int mode)
 						}
 					}
 
-					/* Monochrome */
-					if (!use_color) a = TERM_WHITE;
-
 					/* Dump flag */
 					if (modetemp == 1 && x == 0 && y > 7 && y < 12)
 					{
@@ -2651,7 +2648,7 @@ static void display_player_ben_one(int mode)
 				}
 
 				a = TERM_WHITE;
-				if (use_color && got)
+				if (got)
 				{
 					if (modetemp == 1 && x == 0 && y > 7 && y < 12)
 					{
@@ -3223,11 +3220,6 @@ errr file_character(cptr name, bool full)
 	else
 		fprintf(fff, "\n Always unusual rooms: OFF");
 
-	if (seed_dungeon)
-		fprintf(fff, "\n Persistent Dungeons:  ON");
-	else
-		fprintf(fff, "\n Persistent Dungeons:  OFF");
-
 	fprintf(fff, "\n\n Recall Depth:");
 	for (y = 1; y < max_d_idx; y++)
 	{
@@ -3241,7 +3233,7 @@ errr file_character(cptr name, bool full)
 	if (noscore)
 		fprintf(fff, "\n You have done something illegal.");
 
-	if (PRACE_FLAGS(PR1_EXPERIMENTAL) || seed_dungeon)
+	if (PRACE_FLAGS(PR1_EXPERIMENTAL))
 		fprintf(fff, "\n You have done something experimental.");
 
 	if (stupid_monsters)
diff --git a/src/generate.c b/src/generate.c
index c12fd14e..ca9f58b0 100644
--- a/src/generate.c
+++ b/src/generate.c
@@ -2959,8 +2959,6 @@ static void build_type5(int by0, int bx0)
 	x1 = xval - 11;
 	x2 = xval + 11;
 
-	if (seed_dungeon) Rand_quick = FALSE;
-
 	/* Place the floor area */
 	for (y = y1; y <= y2; y++)
 	{
@@ -3134,8 +3132,6 @@ static void build_type5(int by0, int bx0)
 			(void)place_monster_aux(y, x, r_idx, FALSE, FALSE, MSTATUS_ENEMY);
 		}
 	}
-
-	if (seed_dungeon) Rand_quick = TRUE;
 }
 
 
@@ -3200,8 +3196,6 @@ static void build_type6(int by0, int bx0)
 	x1 = xval - 11;
 	x2 = xval + 11;
 
-	if (seed_dungeon) Rand_quick = FALSE;
-
 	/* Place the floor area */
 	for (y = y1 - 1; y <= y2 + 1; y++)
 	{
@@ -3530,11 +3524,6 @@ static void build_type6(int by0, int bx0)
 
 	/* Center monster */
 	place_monster_aux(yval, xval, what[7], FALSE, FALSE, MSTATUS_ENEMY);
-
-	if (seed_dungeon)
-	{
-		Rand_quick = TRUE;
-	}
 }
 
 /*
@@ -3548,12 +3537,6 @@ static void build_vault(int yval, int xval, int ymax, int xmax, cptr data)
 
 	cave_type *c_ptr;
 
-	/* Vaults are different even in persistent dungeons. */
-	if (seed_dungeon)
-	{
-		Rand_quick = FALSE;
-	}
-
 	/* Clean the between gates arrays */
 	for (i = 0; i < 8; i++)
 	{
@@ -3808,11 +3791,6 @@ static void build_vault(int yval, int xval, int ymax, int xmax, cptr data)
 			}
 		}
 	}
-
-	if (seed_dungeon)
-	{
-		Rand_quick = TRUE;
-	}
 }
 
 /*
@@ -7727,9 +7705,6 @@ static bool cave_gen(void)
 
 	process_hooks(HOOK_GEN_LEVEL, "(d)", is_quest(dun_level));
 
-	/* Monsters and objects change even in persistent dungeons. */
-	if (seed_dungeon) Rand_quick = FALSE;
-
 	/* Basic "amount" */
 	k = (dun_level / 3);
 	if (k > 10) k = 10;
@@ -8488,7 +8463,6 @@ void generate_cave(void)
 	bool loaded = FALSE;
 	char buf[80];
 	s16b town_level = 0;
-	s32b old_seed_dungeon = seed_dungeon;
 
 	/* The dungeon is not ready */
 	character_dungeon = FALSE;
@@ -8517,17 +8491,10 @@ void generate_cave(void)
 	wipe_m_list();
 
 	/* Seed the RNG if appropriate */
-	if (seed_dungeon)
-	{
-		Rand_quick = TRUE;
-		Rand_value = seed_dungeon + dun_level;
-	}
-
 	if (town_level)
 	{
 		Rand_quick = TRUE;
-		seed_dungeon = town_info[town_level].seed;
-		Rand_value = seed_dungeon;
+		Rand_value = town_info[town_level].seed;
 	}
 
 	process_hooks(HOOK_GEN_LEVEL_BEGIN, "");
@@ -8972,13 +8939,6 @@ void generate_cave(void)
 	/* Remember when this level was "created" */
 	old_turn = turn;
 
-	if (seed_dungeon)
-	{
-		Rand_quick = FALSE;
-
-		seed_dungeon = old_seed_dungeon;
-	}
-
 	/* Provide astral chars with the full map */
 	if (p_ptr->astral && dun_level)
 	{
diff --git a/src/loadsave.c b/src/loadsave.c
index 835d1e57..7230d090 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -316,6 +316,7 @@ static bool do_extra(int flag)
 	s16b tmp16s;
 	u32b tmp32u;
 	u16b tmp16b;
+	u32b dummy32u = 0;
 
 	do_string(player_name, 32, flag);
 
@@ -759,10 +760,10 @@ static bool do_extra(int flag)
 		do_s16b(&rune_spells[i].mana, flag);
 	}
 
-	/* Write the "object seeds" */
-	do_u32b(&seed_dungeon, flag);
-	do_u32b(&seed_flavor, flag);
-	do_u32b(&seed_town, flag);
+	/* Load random seeds */
+	do_u32b(&dummy32u, flag);    /* Load-compatibility with old savefiles. */
+	do_u32b(&seed_flavor, flag); /* For consistent object flavors. */
+	do_u32b(&dummy32u, flag);    /* Load-compatibility with old savefiles. */
 
 	/* Special stuff */
 	do_u16b(&panic_save, flag);
@@ -2511,8 +2512,7 @@ static void do_messages(int flag)   /* FIXME! We should be able to unify this be
 
 	s16b num;
 
-	if (flag == LS_SAVE) num = (compress_savefile &&
-		                            (message_num() > 40)) ? 40 : message_num();
+	if (flag == LS_SAVE) num = message_num();
 
 	/* Total */
 	do_s16b(&num, flag);
diff --git a/src/makefile.WHICH b/src/makefile.WHICH
deleted file mode 100644
index eb5e0963..00000000
--- a/src/makefile.WHICH
+++ /dev/null
@@ -1,64 +0,0 @@
-This file documents which makefiles you should use for each system.
-
- * makefile.ami:
-   	Amiga makefile.
-
- * makefile.bcc:
-   	Borland C/C++ compiler version 5 makefile.
-
- * makefile.cyg:
-   	A makefile for people using Cygwin for windows.
-
- * makefile.emx:
-   	A makefile for OS/2. You need the EMX packages and ReXX installed for
-   	this to work.
- 
- * makefile.gdb:
-   	Another makefile for DOS, includes debugging symbols so if you're using
-   	a DOS-based debugger, things will work. Ideally would be combined into
-   	makefile.dos. You want DJGPP and related tools for this.
-
- * makefile.ibm:
-   	Another makefile for people using DOS and DJGPP. Ideally will be rolled
-   	into makefile.dos eventually.
-
- * makefile.lsl:
-   	If you want to try to use SVGAlib, this might provide a start.
-
- * makefile.std:
-   	Most Unix users should use this. Currently the only makefile with a real
-   	install rule. More instructions are found in the file itself.
-
- * makefile.wat:
-   	Watcom C/C++ for DOS makefile.
-
- * makefile.win:
-   	A makefile for people using Borland C 4.5x for windows.
-
- * ToME.proj.xml:
-   	This one isn't really a makefile, but serves the same purpose. It's a
-   	project file for people using CodeWarrior 6 or 7 for the Macintosh.
-   	Because the IDE doesn't make things easier, IMHO, here are instructions:
-   		- Launch CodeWarrior and choose File-Import Project, then select
-   		  ToME.proj.xml in the src folder;
-   		- Save your project as ToME.proj where you find readme files;
-   		- (Optional) Convert graphics tiles to resource from PICT and put them
-   		  in your top folder, i.e. where you find readmes:
-   		  	8x8.rsrc - 8x8.bmp, PICT ID 1001
-   		  	16x16.rsrc - 16x16.bmp, PICT ID 1002
-   		  	mask.rsrc - mask.bmp, PICT ID 1003
-   		  If you are using GraphicsConverter, make sure to scale the images to
-   		  72 pixel per inch while keeping horizontal and vertical scale factors
-   		  to 100%, and *never* add previews;
-   		- (Optional) Grab Sound resources from any Angband binaries and save it
-   		  as AngSound.rsrc, also in the top folder;
-   		- If you don't want graphics and sound effects, remove 8x8.rsrc,
-   		  16x16.rsrc, mask.rsrc and AngSound.rsrc from your project;
-   		- Please take a look at the comment in A-mac-h.pch for a couple of
-   		  source code modifications that may be necessary;
-   		- Click on the build button, or choose that from the project menu; and
-   		- Hope it works.
-   	Carbon compilation requires Carbon SDK 1.1(?) or greater, freely
-   	downloadable from Apple. The project file assumes that "Carbon Support"
-   	folder should be placed directly beneath your CodeWarrior compiler
-   	folder, i.e. where "MacOS Support", "MSL" etc are.
diff --git a/src/makefile.bcc b/src/makefile.bcc
deleted file mode 100644
index 5b3342cc..00000000
--- a/src/makefile.bcc
+++ /dev/null
@@ -1,221 +0,0 @@
-###################################################################
-#
-#  makefile.bcc - Angband makefile for Borland C++ 5.5 (Win32)
-#
-###################################################################
-
-
-###################################################################
-#
-#       Borland specific directives ---
-#
-.AUTODEPEND
-
-###################################################################
-#
-# Set tool and version names:
-
-CPP        = bcc32
-LINKER     = ilink32
-RC         = brc32
-
-###################################################################
-#
-# Name of the *.exe-file
-
-EXE_FILE = tome.exe
-TOLUA    = tolua.exe
-
-###################################################################
-#
-# Debug mode (un-comment for debugging)
-
-# DBGOPT= -v -N -x -xp
-
-
-###################################################################
-#
-# Set any compiler options
-
-CCOPTS = -jb -j1 -Hc -tW -lGn -w- \
-	-D_WIN32_WINNT=0x0400 -DWINVER=0x0400 \
-	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA \
-	-I$(BCCDIR)\include -I. -Ilua -DUSE_LUA \
-        -DUSE_PRECISE_CMOVIE \
-	-DUSE_WINSOCK \
-        -DIRC_SERVER=\"irc.worldirc.org\" -DIRC_PORT=\"6667\" -DIRC_CHANNEL=\"\#tome\"
-
-# Compile flags:
-CPPFLAGS= $(CCOPTS) $(DBGOPT)
-
-######################## Targets ##################################
-
-OBJ = \
-	gods.obj \
-        skills.obj \
-        irc.obj \
-	birth.obj \
-	bldg.obj \
-	cave.obj \
-	cmd1.obj \
-	cmd2.obj \
-	cmd3.obj \
-	cmd4.obj \
-	cmd5.obj \
-	cmd6.obj \
-	cmd7.obj \
-	cmovie.obj \
-	dungeon.obj \
-	files.obj \
-	generate.obj \
-        gen_maze.obj \
-        gen_evol.obj \
-	help.obj \
-	init1.obj \
-	init2.obj \
-	levels.obj \
-	loadsave.obj \
-	lua_bind.obj \
-	main-win.obj \
-	main.obj \
-	melee1.obj \
-	melee2.obj \
-        modules.obj \
-	monster1.obj \
-	monster2.obj \
-	monster3.obj \
-	notes.obj \
-	object1.obj \
-	object2.obj \
-	plots.obj \
-	powers.obj \
-	randart.obj \
-	readdib.obj \
-	script.obj \
-	spells1.obj \
-	spells2.obj \
-	squeltch.obj \
-	status.obj \
-	store.obj \
-	tables.obj \
-	traps.obj \
-	util.obj \
-	variable.obj \
-	wild.obj \
-	wizard1.obj \
-	wizard2.obj \
-	xtra1.obj \
-	xtra2.obj \
-	z-form.obj \
-	z-rand.obj \
-	z-term.obj \
-	z-util.obj \
-	z-virt.obj \
-        z-sock.obj \
-	w_mnster.obj \
-	w_obj.obj \
-	w_play_c.obj \
-	w_player.obj \
-	w_quest.obj \
-	w_spells.obj \
-	w_util.obj \
-	w_z_pack.obj \
-        w_dun.obj \
-	$(TOLUAOBJS)
-
-TOLUAOBJS = \
-	lua\lapi.obj \
-	lua\lauxlib.obj \
-	lua\lbaselib.obj \
-	lua\lcode.obj \
-	lua\ldblib.obj \
-	lua\ldebug.obj \
-	lua\ldo.obj \
-	lua\lfunc.obj \
-	lua\lgc.obj \
-	lua\liolib.obj \
-	lua\llex.obj \
-	lua\lmem.obj \
-	lua\lobject.obj \
-	lua\lparser.obj \
-	lua\lstate.obj \
-	lua\lstring.obj \
-	lua\lstrlib.obj \
-	lua\ltable.obj \
-	lua\ltests.obj \
-	lua\ltm.obj \
-	lua\lundump.obj \
-	lua\lvm.obj \
-	lua\lzio.obj \
-	lua\tolua.obj \
-	lua\tolua_bd.obj \
-	lua\tolua_eh.obj \
-	lua\tolua_gp.obj \
-	lua\tolua_lb.obj \
-	lua\tolua_rg.obj \
-	lua\tolua_tm.obj \
-	lua\tolua_tt.obj \
-	lua\tolualua.obj \
-
-all : $(EXE_FILE)
-	copy $(EXE_FILE) ..
-
-clean:
-	-@if exist *.obj del *.obj >nul
-	-@if exist lua\*.obj del lua\*.obj >nul
-	-@if exist *.exe del *.exe >nul
-	-@if exist *.res del *.res >nul
-	-@if exist *.tds del *.tds >nul
-	-@if exist *.ilc del *.ilc >nul
-	-@if exist *.ild del *.ild >nul
-	-@if exist *.ilf del *.ilf >nul
-	-@if exist *.ils del *.ils >nul
-
-install: $(EXE_FILE)
-	copy $(EXE_FILE) ..
-
-
-########################### Explicit Rules ########################
-$(EXE_FILE): $(OBJ) angband.res
-	$(LINKER) -aa -L$(BCCDIR)\lib -x $(OBJ) c0w32.obj, $(EXE_FILE),, cw32.lib import32.lib,, angband.res
-
-$(TOLUA): $(TOLUAOBJS)
-        $(LINKER) -aa -L$(BCCDIR)\lib -x $(TOLUAOBJS) c0x32.obj, tolua.exe,, cw32.lib import32.lib
-
-angband.res: angband.rc
-	$(RC) -r angband.rc
-
-w_mnster.c: monster.pkg $(TOLUA)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUA)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUA)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUA)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUA)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUA)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUA)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUA)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-########################### Implicit Rules ########################
-.c.obj:
-	$(CPP) $(CPPFLAGS) -c -o$*.obj $*.c
-
-.obj.exe:
-	$(CPP) $(CPPFLAGS) $<
-
diff --git a/src/makefile.bsd b/src/makefile.bsd
deleted file mode 100644
index bff25351..00000000
--- a/src/makefile.bsd
+++ /dev/null
@@ -1,298 +0,0 @@
-# This is based on Makefile.std but stripped and tuned for FreeBSD (and
-# presumably will cooperate with other BSDs)
-
-# Comment out this line if you don't want the IRC support
-IRC=TRUE
-
-## Installation locations and such
-##
-## LIBDIR, BINDIR and OWNER should be set appropriately for
-## multiuser installations.
-##
-## If you want to keep it private or don't have root privilege
-## required by "make install", set LIBDIR to ./lib/ or an absolute
-## path pointing to your lib directory, and don't run "make install".
-##
-## NOTE: If LIBDIR is set to ./lib/ , you have to cd to parent directory
-## of lib before you start the game.
-##
-
-PREFIX ?= /usr/local
-X11BASE ?= /usr/X11R6
-
-# Where lib/ files goes
-LIBDIR = $(PREFIX)/share/tome
-
-# Where ToME binary goes
-BINDIR = $(PREFIX)/bin
-
-# The game will run suid to this user
-OWNER = root
-GROUP = games
-FILE_MODE = 0664
-
-## Some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like.  For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-# This is my compiler of choice, it seems to work most everywhere
-#
-CC ?= cc
-
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "INCLUDES", if your machine places files in a weird location
-# (e.g. -I/usr/X11R6/include, as is almost always the case with
-# linux and *BSD). Since we have seen many linux users -- arguably
-# the largest unix population -- confused by this, and adding this
-# usually doesn't hurt, the default rule has been changed to search
-# for /usr/X11R6/include.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "INCLUDES",
-# and/or "-DUSE_NCURSES" to "DEFINES".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-COPTS = -Wall -g
-INCLUDES = -I$(X11BASE)/include
-DEFINES = -DUSE_X11 -DUSE_GCU\
-	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK -DFILE_MODE=$(FILE_MODE)
-LIBS = -lX11 -lcurses -L$(X11BASE)/lib
-
-
-### End of configurable section ###
-
-#
-# The "source" and "object" files.
-#
-
-BASESRCS = \
-  main-gtk.c main-gcu.c main-x11.c main-xaw.c main-sdl.c \
-  z-rand.c z-util.c z-form.c z-virt.c z-term.c z-sock.c \
-  variable.c tables.c plots.c util.c cave.c dungeon.c \
-  melee1.c melee2.c modules.c \
-  object1.c object2.c randart.c squeltch.c traps.c \
-  monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c skills.c powers.c gods.c \
-  spells1.c spells2.c \
-  status.c files.c notes.c loadsave.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  help.c \
-  generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c \
-  cmovie.c irc.c \
-  wizard2.c init2.c birth.c wizard1.c init1.c main.c
-
-BASEOBJS = \
-  main-gtk.o main-gcu.o main-x11.o main-xaw.o main-sdl.o \
-  z-rand.o z-util.o z-form.o z-virt.o z-term.o z-sock.o \
-  variable.o tables.o plots.o util.o cave.o dungeon.o \
-  melee1.o melee2.o modules.o \
-  object1.o object2.o randart.o squeltch.o traps.o \
-  monster1.o monster2.o monster3.o \
-  xtra1.o xtra2.o skills.o powers.o gods.o \
-  spells1.o spells2.o \
-  status.o files.o notes.o loadsave.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  help.o \
-  generate.o gen_maze.o gen_evol.o wild.o levels.o store.o bldg.o \
-  cmovie.o irc.o \
-  wizard2.o init2.o birth.o wizard1.o init1.o main.o
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS += $(COPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
-
-
-#
-# Lua support
-#
-
-INCLUDES += -Ilua -I.
-DEFINES += -DUSE_LUA
-SRCS = $(LUASRCS) $(TOLUASRCS) $(BASESRCS)
-OBJS = $(LUAOBJS) $(TOLUAOBJS) $(BASEOBJS)
-
-# Force recreation of stub files when lua source files are updated
-# To be included in dependency rules
-TOLUADEP = $(TOLUA) $(TOLUASRCS) lua/tolua.c lua/tolualua.c
-
-#
-# IRC support
-#
-
-IRC_SERVER=irc.worldirc.org
-IRC_PORT=6667
-IRC_CHANNEL=\#tome
-
-DEFINES += \
-	-DIRC_SERVER=\"$(IRC_SERVER)\" \
-	-DIRC_PORT=\"$(IRC_PORT)\" \
-	-DIRC_CHANNEL=\"$(IRC_CHANNEL)\"
-
-
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-
-TOLUA = ./tolua
-
-default: $(TOLUA) $(TARGET)
-	@echo "*** Note: In order to use the install rule, which now actually"
-	@echo "*** handles the installation of the library dir, you need to edit"
-	@echo "*** this makefile, going to the top and making sure LIBDIR suits"
-	@echo "*** your desired install dir properly. The LIBRARY_DIR you used"
-	@echo "*** to set in config.h is now ignored and obsolete with respect"
-	@echo "*** to this makefile. Note that if you edit this makefile, you may"
-	@echo "*** need to recompile so all the files that reference those defines"
-	@echo "*** notice the changes."
-
-$(TARGET): $(OBJS)
-	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-#
-# An install rule.
-#
-mini_install: default
-	cp -f $(TARGET) ..
-
-install: default
-	[ -d $(LIBDIR) ] || mkdir -p $(LIBDIR)
-	[ -d $(BINDIR) ] || mkdir -p $(BINDIR)
-	cp -r ../lib/* $(LIBDIR)
-	chown -R $(OWNER):$(GROUP) $(LIBDIR)
-	chmod -R g+w $(LIBDIR)
-	cp -f $(TARGET) $(BINDIR)/$(TARGET)
-	strip $(BINDIR)/$(TARGET)
-	chown $(OWNER):$(GROUP) $(BINDIR)/$(TARGET)
-	chmod 2755 $(BINDIR)/$(TARGET)
-
-# old-install: $(TARGET)
-#	cp $(TARGET) ..
-
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak *.o lua/*.o  w_*.c
-
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-
-#
-# Quests
-#
-plots.o: q_rand.c q_main.c q_one.c q_ultrag.c q_ultrae.c \
-	q_thief.c q_hobbit.c q_nazgul.c q_troll.c q_wight.c \
-	q_spider.c q_poison.c \
-	q_eol.c q_nirna.c q_invas.c \
-	q_betwen.c \
-	q_narsil.c q_shroom.c q_thrain.c q_wolves.c q_dragons.c q_haunted.c q_evil.c
-
-#
-# Lua library compilation rules
-#
-
-w_mnster.c: monster.pkg $(TOLUADEP)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUADEP)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUADEP)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUADEP)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUADEP)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUADEP)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUADEP)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUADEP)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.cyg b/src/makefile.cyg
deleted file mode 100644
index 2fb3fa42..00000000
--- a/src/makefile.cyg
+++ /dev/null
@@ -1,433 +0,0 @@
-# This is a makefile for the Cygwin tools which may
-# be downloaded by following the links from the URL:
-# http://sources.redhat.com/cygwin/
-#
-# To compile with this makefile, rename it from 'makefile.cyg'
-# to 'makefile', then enter the src directory and type
-# 'make install'.
-
-##
-## Before you type "make depend; make", please follow these three steps.
-##
-## 1. Lua-support and GNU Make ifdef's
-##
-## The ifdef ... endif struct may not be supported by 'make'
-## you are using.  GNU make does and Berkeley make doesn't, for example.
-## If it doesn't, you can still manually enable/disable them with minimum
-## amount of effort:
-## (1) Search for lines containing ifdef and endif (one occurence for each)
-## (2) Comment these lines out
-## (3-optional) Comment out lines surrounded by these if you are
-##     *not* going to compile the game with Lua scripting enabled.
-##
-
-# Comment out this line if you don't want Lua scripting
-LUA=TRUE
-
-#IRCARGS = -DIRC_SERVER=\"irc.worldirc.org\" -DIRC_PORT=\"6667\" -DIRC_CHANNEL=\"\#tome\"
-
-
-
-##
-## 2. Installation locations and such
-##
-## LIBDIR, BINDIR and OWNER should be set appropriately for
-## multiuser installations.
-##
-## If you want to keep it private or don't have root privilege
-## required by "make install", set LIBDIR to ./lib/ or an absolute
-## path pointing to your lib directory, and don't run "make install".
-##
-## NOTE: If LIBDIR is set to ./lib/ , you have to cd to parent directory
-## of lib before you start the game.
-##
-
-# Where lib/ files goes
-#LIBDIR = /usr/lib/games/pernband/
-# Sysadmins of commercial Unix and/or BSD might prefer this
-#LIBDIR = /usr/local/lib/pernband/
-# If you like the old default, use this one
-LIBDIR = ./lib/
-# Another example: single user installation using absolute path
-#LIBDIR = /home/myloginname/lib/pern/
-
-
-# Where PernAngband binary goes
-#BINDIR = /usr/local/games
-# Another common location
-#BINDIR = /usr/local/bin
-
-# The game will run suid to this user
-#OWNER = games
-
-##
-## 3. Some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like.  For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere
-#
-CC = gcc
-
-#
-# resource complier
-#
-
-WRES = windres
-
-#
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "INCLUDES", if your machine places files in a weird location
-# (e.g. -I/usr/X11R6/include, as is almost always the case with
-# linux and *BSD). Since we have seen many linux users -- arguably
-# the largest unix population -- confused by this, and adding this
-# usually doesn't hurt, the default rule has been changed to search
-# for /usr/X11R6/include.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "INCLUDES",
-# and/or "-DUSE_NCURSES" to "DEFINES".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS = -lX11 -lcurses -L/usr/X11R6/lib
-
-
-##
-## For cygwin
-##
-COPTS = -s -Wall -mno-cygwin -O2 -fno-strength-reduce
-INCLUDES =
-DEFINES = -DWINDOWS -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA \
-	-DUSE_PRECISE_CMOVIE \
-        -DUSE_WINSOCK \
-        $(IRCARGS)
-
-LIBS = -mno-cygwin -mwindows -e _mainCRTStartup -lwinmm -lwsock32
-
-
-##
-## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `gtk-config --cflags`
-#DEFINES = -DUSE_GTK -DUSE_TRANSPARENCY
-#LIBS = -lX11 -L/usr/X11R6/lib `gtk-config --libs`
-
-##
-## Variation -- Only support "main-x11.c" (not "main-gcu.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11
-#LIBS = -lX11 -L/usr/X11R6/lib
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_XAW -DUSE_GCU
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
-
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_CAP
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_CAP -DUSE_HARDCODE
-
-
-##
-## Variation -- this might work for Linux 1.1.93 using ncurses-1.8.7.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_TPOSIX -DUSE_CURS_SET
-#LIBS = -lX11 -lncurses
-#LDFLAGS = -s
-
-
-##
-## Variation -- compile for FreeBSD with ncurses
-## -- BSD curses gives you B&W display.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_NCURSES
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-
-
-##
-## Variation -- compile for Solaris
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSOLARIS
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSGI
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC     = cc
-##COPTS = -std -O -g3 -Olimit 4000
-#COPTS = -std -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS   = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DISC
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#COPTS = -Wall -O1 -pipe -g -arch m68k -arch i386
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-### End of configurable section ###
-
-#
-# The "source" and "object" files.
-#
-
-BASESRCS = \
-  z-util.c z-virt.c z-form.c z-rand.c z-term.c z-sock.c \
-  variable.c tables.c util.c cave.c cmovie.c \
-  object1.c object2.c traps.c monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c spells1.c spells2.c \
-  melee1.c melee2.c loadsave.c files.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  store.c birth.c notes.c help.c \
-  status.c randart.c gods.c modules.c \
-  wizard1.c wizard2.c levels.c \
-  generate.c gen_maze.c gen_evol.c dungeon.c init1.c init2.c \
-  bldg.c squeltch.c wild.c powers.c plots.c \
-  irc.c skills.c \
-  readdib.c angband.rc main-win.c main.c
-
-BASEOBJS = \
-  z-term.o z-rand.o z-form.o z-virt.o z-util.o z-sock.o \
-  main.o main-win.o readdib.o angband.res \
-  generate.o gen_maze.o gen_evol.o dungeon.o init1.o init2.o plots.o help.o \
-  store.o birth.o wizard1.o wizard2.o bldg.o cmovie.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  loadsave.o files.o levels.o notes.o squeltch.o \
-  status.o randart.o irc.o skills.o gods.o modules.o \
-  xtra1.o xtra2.o spells1.o spells2.o melee1.o melee2.o \
-  object1.o object2.o traps.o monster1.o monster2.o monster3.o \
-  variable.o tables.o util.o cave.o wild.o powers.o
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS = $(COPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
-
-
-#
-# Lua support
-#
-
-LUAFLAGS = -DUSE_LUA -Ilua -I.
-
-ifdef LUA
-SRCS += $(LUASRCS)
-OBJS += $(LUAOBJS)
-SRCS += $(TOLUASRCS)
-OBJS += $(TOLUAOBJS)
-CFLAGS += $(LUAFLAGS)
-endif
-
-
-#
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-TOLUA = ./tolua
-
-default: $(TARGET) $(TOLUA)
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-#
-# An install rule.
-#
-install: default
-	cp -f $(TARGET) ..
-
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak $(OBJS)
-
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-.SUFFIXES: .rc .res
-.rc.res:
-	$(WRES) $< -O coff -o $@
-
-#
-# Lua library compilation rules
-#
-
-ifdef LUA
-w_mnster.c: monster.pkg $(TOLUA)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUA)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUA)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUA)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUA)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUA)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUA)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUA)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-endif
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.mingw b/src/makefile.mingw
deleted file mode 100644
index 3e081524..00000000
--- a/src/makefile.mingw
+++ /dev/null
@@ -1,431 +0,0 @@
-# This is a makefile for the mingw corss platform compiler
-#
-# To compile with this makefile, rename it from 'makefile.mingw'
-# to 'makefile', then enter the src directory and type
-# 'make'.
-
-##
-## Before you type "make depend; make", please follow these three steps.
-##
-## 1. Lua-support and GNU Make ifdef's
-##
-## The ifdef ... endif struct may not be supported by 'make'
-## you are using.  GNU make does and Berkeley make doesn't, for example.
-## If it doesn't, you can still manually enable/disable them with minimum
-## amount of effort:
-## (1) Search for lines containing ifdef and endif (one occurence for each)
-## (2) Comment these lines out
-## (3-optional) Comment out lines surrounded by these if you are
-##     *not* going to compile the game with Lua scripting enabled.
-##
-
-# Comment out this line if you don't want Lua scripting
-LUA=TRUE
-
-#IRCARGS = -DIRC_SERVER=\"irc.worldirc.org\" -DIRC_PORT=\"6667\" -DIRC_CHANNEL=\"\#tome\"
-
-
-
-##
-## 2. Installation locations and such
-##
-## LIBDIR, BINDIR and OWNER should be set appropriately for
-## multiuser installations.
-##
-## If you want to keep it private or don't have root privilege
-## required by "make install", set LIBDIR to ./lib/ or an absolute
-## path pointing to your lib directory, and don't run "make install".
-##
-## NOTE: If LIBDIR is set to ./lib/ , you have to cd to parent directory
-## of lib before you start the game.
-##
-
-# Where lib/ files goes
-#LIBDIR = /usr/lib/games/pernband/
-# Sysadmins of commercial Unix and/or BSD might prefer this
-#LIBDIR = /usr/local/lib/pernband/
-# If you like the old default, use this one
-LIBDIR = .\lib
-# Another example: single user installation using absolute path
-#LIBDIR = /home/myloginname/lib/pern/
-
-
-# Where PernAngband binary goes
-#BINDIR = /usr/local/games
-# Another common location
-#BINDIR = /usr/local/bin
-
-# The game will run suid to this user
-#OWNER = games
-
-##
-## 3. Some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like.  For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere
-#
-CC = i386-mingw32msvc-gcc
-
-#
-# resource complier
-#
-
-WRES = i386-mingw32msvc-windres
-
-#
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "INCLUDES", if your machine places files in a weird location
-# (e.g. -I/usr/X11R6/include, as is almost always the case with
-# linux and *BSD). Since we have seen many linux users -- arguably
-# the largest unix population -- confused by this, and adding this
-# usually doesn't hurt, the default rule has been changed to search
-# for /usr/X11R6/include.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "INCLUDES",
-# and/or "-DUSE_NCURSES" to "DEFINES".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS = -lX11 -lcurses -L/usr/X11R6/lib
-
-
-##
-## For cygwin
-##
-COPTS = -s -Wall -mno-cygwin -O2 -fno-strength-reduce
-INCLUDES =
-DEFINES = -DWINDOWS -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA \
-	-DUSE_PRECISE_CMOVIE \
-        -DUSE_WINSOCK \
-        $(IRCARGS)
-
-LIBS = -mno-cygwin -mwindows -e _mainCRTStartup -lwinmm -lwsock32
-
-
-##
-## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `gtk-config --cflags`
-#DEFINES = -DUSE_GTK -DUSE_TRANSPARENCY
-#LIBS = -lX11 -L/usr/X11R6/lib `gtk-config --libs`
-
-##
-## Variation -- Only support "main-x11.c" (not "main-gcu.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11
-#LIBS = -lX11 -L/usr/X11R6/lib
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_XAW -DUSE_GCU
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
-
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_CAP
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_CAP -DUSE_HARDCODE
-
-
-##
-## Variation -- this might work for Linux 1.1.93 using ncurses-1.8.7.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_TPOSIX -DUSE_CURS_SET
-#LIBS = -lX11 -lncurses
-#LDFLAGS = -s
-
-
-##
-## Variation -- compile for FreeBSD with ncurses
-## -- BSD curses gives you B&W display.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_NCURSES
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-
-
-##
-## Variation -- compile for Solaris
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSOLARIS
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSGI
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC     = cc
-##COPTS = -std -O -g3 -Olimit 4000
-#COPTS = -std -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU
-#LIBS   = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DISC
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#COPTS = -Wall -O1 -pipe -g -arch m68k -arch i386
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-### End of configurable section ###
-
-#
-# The "source" and "object" files.
-#
-
-BASESRCS = \
-  z-util.c z-virt.c z-form.c z-rand.c z-term.c z-sock.c \
-  variable.c tables.c util.c cave.c cmovie.c \
-  object1.c object2.c traps.c monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c spells1.c spells2.c \
-  melee1.c melee2.c loadsave.c files.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  store.c birth.c notes.c help.c \
-  status.c randart.c gods.c modules.c \
-  wizard1.c wizard2.c levels.c \
-  generate.c gen_maze.c gen_evol.c dungeon.c init1.c init2.c \
-  bldg.c squeltch.c wild.c powers.c plots.c \
-  irc.c skills.c \
-  readdib.c angband.rc main-win.c main.c
-
-BASEOBJS = \
-  z-term.o z-rand.o z-form.o z-virt.o z-util.o z-sock.o \
-  main.o main-win.o readdib.o angband.res \
-  generate.o gen_maze.o gen_evol.o dungeon.o init1.o init2.o plots.o help.o \
-  store.o birth.o wizard1.o wizard2.o bldg.o cmovie.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  loadsave.o files.o levels.o notes.o squeltch.o \
-  status.o randart.o irc.o skills.o gods.o modules.o \
-  xtra1.o xtra2.o spells1.o spells2.o melee1.o melee2.o \
-  object1.o object2.o traps.o monster1.o monster2.o monster3.o \
-  variable.o tables.o util.o cave.o wild.o powers.o
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS = $(COPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
-
-
-#
-# Lua support
-#
-
-LUAFLAGS = -DUSE_LUA -Ilua -I.
-
-ifdef LUA
-SRCS += $(LUASRCS)
-OBJS += $(LUAOBJS)
-SRCS += $(TOLUASRCS)
-OBJS += $(TOLUAOBJS)
-CFLAGS += $(LUAFLAGS)
-endif
-
-
-#
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-TOLUA = ./tolua
-
-default: $(TARGET) $(TOLUA)
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-#
-# An install rule.
-#
-install: default
-	cp -f $(TARGET) ..
-
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak $(OBJS)
-
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-.SUFFIXES: .rc .res
-.rc.res:
-	$(WRES) $< -O coff -o $@
-
-#
-# Lua library compilation rules
-#
-
-ifdef LUA
-w_mnster.c: monster.pkg $(TOLUA)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUA)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUA)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUA)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUA)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUA)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUA)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUA)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-endif
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.osx b/src/makefile.osx
deleted file mode 100644
index 756231c6..00000000
--- a/src/makefile.osx
+++ /dev/null
@@ -1,210 +0,0 @@
-BUNDLENAME = ToME
-BUNDLEDIR = ../$(BUNDLENAME).app
-CONTENTSDIR = $(BUNDLEDIR)/Contents
-BINDIR = $(CONTENTSDIR)/MacOS
-RESOURCEDIR = $(CONTENTSDIR)/Resources
-LIBDIR = $(RESOURCEDIR)
-
-CC = MACOSX_DEPLOYMENT_TARGET="10.1" cc
-
-COPTS = -Wall -Os -g -pipe -fpascal-strings
-#-Wno-deprecated-declarations
-DEFINES = -DUSE_MACOSX -DMACH_O_CARBON \
-	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK \
-	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA
-LIBS = -framework CoreFoundation -framework QuickTime -framework Carbon
-
-# Universal binary support
-COPTS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
-LIBS += -arch i386 -arch ppc -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
-
-BASESRCS = \
-  main-crb.c \
-  z-rand.c z-util.c z-form.c z-virt.c z-term.c z-sock.c \
-  variable.c tables.c plots.c util.c cave.c dungeon.c \
-  melee1.c melee2.c modules.c \
-  object1.c object2.c randart.c squeltch.c traps.c \
-  monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c skills.c powers.c gods.c \
-  spells1.c spells2.c \
-  status.c files.c notes.c loadsave.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  help.c \
-  generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c \
-  cmovie.c irc.c \
-  wizard2.c init2.c birth.c wizard1.c init1.c
-
-BASEOBJS = \
-  main-crb.o \
-  z-rand.o z-util.o z-form.o z-virt.o z-term.o z-sock.o \
-  variable.o tables.o plots.o util.o cave.o dungeon.o \
-  melee1.o melee2.o modules.o \
-  object1.o object2.o randart.o squeltch.o traps.o \
-  monster1.o monster2.o monster3.o \
-  xtra1.o xtra2.o skills.o powers.o gods.o \
-  spells1.o spells2.o \
-  status.o files.o notes.o loadsave.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  help.o \
-  generate.o gen_maze.o gen_evol.o wild.o levels.o store.o bldg.o \
-  cmovie.o irc.o \
-  wizard2.o init2.o birth.o wizard1.o init1.o
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS = $(COPTS) $(INCLUDES) $(DEFINES)
-
-
-#
-# Lua support
-#
-
-INCLUDES += -Ilua -I.
-DEFINES += -DUSE_LUA
-SRCS = $(LUASRCS) $(TOLUASRCS) $(BASESRCS)
-OBJS = $(LUAOBJS) $(TOLUAOBJS) $(BASEOBJS)
-
-# Force recreation of stub files when lua source files are updated
-# To be included in dependency rules
-TOLUADEP = $(TOLUASRCS) lua/tolua.c lua/tolualua.c $(TOLUA)
-
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-
-TOLUA = ./tolua
-
-default: $(TOLUA) $(TARGET)
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-install: default
-	[ -d $(BUNDLEDIR) ] || mkdir $(BUNDLEDIR)
-	[ -d $(CONTENTSDIR) ] || mkdir $(CONTENTSDIR)
-	[ -d $(BINDIR) ]  || mkdir $(BINDIR)
-	[ -d $(RESOURCEDIR) ]  || mkdir $(RESOURCEDIR)
-	install -m 755 $(TARGET) $(BINDIR)
-	install -m 644 carbon/*.icns $(RESOURCEDIR)
-	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -d MACH_O -o $(RESOURCEDIR)/tome.rsrc carbon/Carbon.r
-	install -m 644 carbon/Info.plist $(CONTENTSDIR)/Info.plist
-	/Developer/Tools/SetFile -a B $(BUNDLEDIR)
-	rsync -r --exclude="*CVS*" --exclude="*xtra/graf*" --exclude="*xtra/font*" ../lib/* $(RESOURCEDIR)
-	rsync ../lib/mods/*.lua $(RESOURCEDIR)/core
-	rsync ../lib/xtra/graf/*.png $(RESOURCEDIR)
-
-BUNDLEDIR := ../ToME.app
-APPVERSION := `carbon/getversion`
-IMAGENAME := ToME $(APPVERSION)
-IMAGEPATH := /Volumes/$(IMAGENAME)
-
-image: install
-	[ -d "$(IMAGEPATH)" ] && diskutil eject "$(IMAGEPATH)" || true
-
-	hdiutil create -fs HFS+ -volname "$(IMAGENAME)" -ov -type SPARSE -attach "$(IMAGENAME)"
-	cp -r "$(BUNDLEDIR)" ../changes.txt ../credits.txt ../changes.old "$(IMAGEPATH)"
-	cp carbon/Image-DS_Store "$(IMAGEPATH)/.DS_Store"
-	diskutil eject "$(IMAGEPATH)"
-
-	rm -f "$(IMAGENAME).dmg"
-	hdiutil convert "$(IMAGENAME).sparseimage" -format UDZO -o "$(IMAGENAME)"
-	rm "$(IMAGENAME).sparseimage"
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak *.o lua/*.o w_*.c $(TOLUA) $(TARGET)
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-
-#
-# Quests
-#
-plots.o: q_rand.c q_main.c q_one.c q_ultrag.c q_ultrae.c \
-	q_thief.c q_hobbit.c q_nazgul.c q_troll.c q_wight.c \
-	q_spider.c q_poison.c \
-	q_eol.c q_nirna.c q_invas.c \
-	q_betwen.c \
-	q_narsil.c q_shroom.c q_thrain.c q_wolves.c q_dragons.c q_haunted.c q_evil.c
-
-#
-# Lua library compilation rules
-#
-
-w_mnster.c: monster.pkg $(TOLUADEP)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUADEP)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUADEP)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUADEP)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUADEP)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUADEP)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUADEP)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUADEP)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.sdliso b/src/makefile.sdliso
deleted file mode 100644
index 2c939d92..00000000
--- a/src/makefile.sdliso
+++ /dev/null
@@ -1,496 +0,0 @@
-# File: Makefile
-
-# This is not a very "nice" Makefile, but it usually works.
-
-#
-# Note that you may have to make modifications below according
-# to your machine, available libraries, compilation options,
-# and your "visual module" of choice.  This Makefile is intended
-# for use with Unix machines running X11, Curses, Ncurses, or Vt100,
-# or possibly for "Atari" or "Amiga" computers with "Curses" ports,
-# see below for more information.
-#
-# Note that "main-mac.c" and "main-crb.c", the visual modules for
-# the Macintosh, must be compiled in a special way, see elsewhere.
-#
-# Note that "main-win.c", the visual module for Windows,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-ibm.c" and "main-emx.c", the visual modules
-# for various types of IBM-PC computers, must be compiled with
-# special Makefiles, see elsewhere.
-#
-# Note that "main-lsl.c", the visual module for Linux-SVGALIB
-# must be compiled with "Makefile.lsl", see elsewhere.
-#
-# Note that "main-acn.c", the visual module for Risc Acorn,
-# must be compiled with "Makefile.acn", see elsewhere.
-#
-# Note that "Makefile.wat" is a slight variation on "Makefile.ibm",
-# which allow the use of "main-ibm.c" with special compiler
-# (might be out-of-date).
-#
-# If you are able to construct "main-xxx.c" and/or "Makefile.xxx"
-# files for a currently unsupported system, please send them to me
-# (rr9@angband.org) for inclusion in future versions.
-#
-
-##
-## 1. Installation locations and such
-##
-## LIBDIR, BINDIR and OWNER should be set appropriately for
-## multiuser installations.
-##
-## If you want to keep it private or don't have root privilege
-## required by "make install", set LIBDIR to ./lib/ or an absolute
-## path pointing to your lib directory, and don't run "make install".
-##
-## NOTE: If LIBDIR is set to ./lib/ , you have to cd to parent directory
-## of lib before you start the game.
-##
-
-# Where lib/ files goes
-#LIBDIR = /usr/lib/games/tome/
-# Sysadmins of commercial Unix and/or BSD might prefer this
-#LIBDIR = /usr/local/lib/tome/
-# If you like the old default, use this one
-LIBDIR = ./lib/
-# Another example: single user installation using absolute path
-#LIBDIR = /home/myloginname/lib/tome/
-
-
-# Where ToME binary goes
-BINDIR = /usr/local/games
-# Another common location
-#BINDIR = /usr/local/bin
-
-# The game will run suid to this user
-OWNER = games
-
-# Ignore this if you're not making a package
-DESTDIR=
-
-##
-## 2. Some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like.  For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere
-#
-CC = gcc
-
-# Profiling options
-# PROFILECOPTS = -pg
-# PROFILELDFLAGS = -pg
-
-#
-# Standard version (see main-x11.c and main-gcu.c)
-#
-# This version supports both "X11" and "curses" in a single executable.
-#
-# You may have to add various X11 include/library directories to the
-# "INCLUDES", if your machine places files in a weird location
-# (e.g. -I/usr/X11R6/include, as is almost always the case with
-# linux and *BSD). Since we have seen many linux users -- arguably
-# the largest unix population -- confused by this, and adding this
-# usually doesn't hurt, the default rule has been changed to search
-# for /usr/X11R6/include.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "INCLUDES",
-# and/or "-DUSE_NCURSES" to "DEFINES".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 \
-#	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-#	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
-#LIBS = -lX11 -L/usr/X11R6/lib
-
-##
-## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `gtk-config --cflags`
-#DEFINES = -DUSE_GTK -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = `gtk-config --libs`
-
-#
-# Variation -- Only support "main-x11.c" (not "main-gcu.c")
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -L/usr/X11R6/lib
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_XAW -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
-
-##
-## Variation -- Use "main-sdl.c" instead of "main-x11.c"
-##
-SDL_CONFIG ?= sdl-config
-COPTS = -Wall -O1 -pipe -g
-INCLUDES = `$(SDL_CONFIG) --cflags`
-DEFINES = -DUSE_SDL -DUSE_GCU \
-	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
-	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK -DSUPPORT_GAMMA \
-	-DUSE_ISO
-LIBS = `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_ttf -lcurses
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_CAP \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_CAP -DUSE_HARDCODE
-
-
-##
-## Variation -- this might work for Linux 1.1.93 using ncurses-1.8.7.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_TPOSIX -DUSE_CURS_SET \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-#LDFLAGS = -s
-
-
-##
-## Variation -- compile for FreeBSD with ncurses
-## -- BSD curses gives you B&W display.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_NCURSES \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-
-
-##
-## Variation -- compile for Solaris
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSOLARIS \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-## The SGI has hardware gamma correction.
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSGI \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC     = cc
-##COPTS = -std -O -g3 -Olimit 4000
-#COPTS = -std -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS   = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DISC \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#COPTS = -Wall -O1 -pipe -g -arch m68k -arch i386
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-### End of configurable section ###
-
-#
-# The "source" and "object" files.
-#
-
-BASESRCS = \
-  main-gtk.c main-gcu.c main-x11.c main-xaw.c main-dmy.c \
-  z-rand.c z-util.c z-form.c z-virt.c z-term.c z-sock.c \
-  variable.c tables.c plots.c util.c cave.c dungeon.c \
-  melee1.c melee2.c modules.c \
-  object1.c object2.c randart.c squeltch.c traps.c \
-  monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c skills.c powers.c gods.c \
-  spells1.c spells2.c \
-  status.c files.c notes.c loadsave.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  help.c \
-  generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c \
-  cmovie.c irc.c \
-  wizard2.c init2.c birth.c wizard1.c init1.c \
-  iso/simgraph.c iso/simview.c iso/world_adaptor.c iso/world_view.c \
-  main-sdl-iso.c maim-iso.c
-
-
-BASEOBJS = \
-  main-gtk.o main-gcu.o main-x11.o main-xaw.o main-dmy.o \
-  z-rand.o z-util.o z-form.o z-virt.o z-term.o z-sock.o \
-  variable.o tables.o plots.o util.o cave.o dungeon.o \
-  melee1.o melee2.o modules.o \
-  object1.o object2.o randart.o squeltch.o traps.o \
-  monster1.o monster2.o monster3.o \
-  xtra1.o xtra2.o skills.o powers.o gods.o \
-  spells1.o spells2.o \
-  status.o files.o notes.o loadsave.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  help.o \
-  generate.o gen_maze.o gen_evol.o wild.o levels.o store.o bldg.o \
-  cmovie.o irc.o \
-  wizard2.o init2.o birth.o wizard1.o init1.o \
-  iso/simgraph.o iso/simview.o iso/world_adaptor.o iso/world_view.o \
-  main-sdl-iso.o maim-iso.o
-
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS = $(COPTS) $(PROFILECOPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
-
-
-#
-# Lua support
-#
-
-INCLUDES += -Ilua -I.
-DEFINES += -DUSE_LUA
-SRCS = $(LUASRCS) $(TOLUASRCS) $(BASESRCS)
-OBJS = $(LUAOBJS) $(TOLUAOBJS) $(BASEOBJS)
-
-# Force recreation of stub files when lua source files are updated
-# To be included in dependency rules
-TOLUADEP = $(TOLUASRCS) lua/tolua.c lua/tolualua.c
-
-#
-# IRC support
-#
-
-IRC_SERVER=irc.worldirc.org
-IRC_PORT=6667
-IRC_CHANNEL=\#tome
-
-DEFINES += \
-	-DIRC_SERVER=\"$(IRC_SERVER)\" \
-	-DIRC_PORT=\"$(IRC_PORT)\" \
-	-DIRC_CHANNEL=\"$(IRC_CHANNEL)\"
-
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-
-TOLUA = ./tolua
-
-default: $(TOLUA) $(TARGET)
-	@echo "*** Note: In order to use the install rule, which now actually"
-	@echo "*** handles the installation of the library dir, you need to edit"
-	@echo "*** this makefile, going to the top and making sure LIBDIR suits"
-	@echo "*** your desired install dir properly. The LIBRARY_DIR you used"
-	@echo "*** to set in config.h is now ignored and obsolete with respect"
-	@echo "*** to this makefile. Note that if you edit this makefile, you may"
-	@echo "*** need to recompile so all the files that reference those defines"
-	@echo "*** notice the changes."
-
-$(TARGET): $(OBJS)
-	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-#
-# An install rule.
-#
-mini_install: default
-	cp -f $(TARGET) ..
-
-install: default
-	[ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR)
-	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
-	cp -r ../lib/* $(DESTDIR)$(LIBDIR)
-	chown -R $(OWNER) $(DESTDIR)$(LIBDIR)
-	cp -f $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
-	chown $(OWNER) $(DESTDIR)$(BINDIR)/$(TARGET)
-	chmod 4755 $(DESTDIR)$(BINDIR)/$(TARGET)
-
-# old-install: $(TARGET)
-#	cp $(TARGET) ..
-
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak *.o lua/*.o
-
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-
-#
-# Quests
-#
-plots.o: q_rand.c q_main.c q_one.c q_ultrag.c q_ultrae.c \
-	q_thief.c q_hobbit.c q_nazgul.c q_troll.c q_wight.c \
-	q_spider.c q_poison.c \
-	q_eol.c q_nirna.c q_invas.c \
-	q_betwen.c \
-	q_narsil.c q_shroom.c q_thrain.c q_wolves.c q_dragons.c q_haunted.c q_evil.c
-
-#
-# Lua library compilation rules
-#
-
-w_mnster.c: monster.pkg $(TOLUADEP)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUADEP)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUADEP)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUADEP)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUADEP)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUADEP)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUADEP)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUADEP)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.std b/src/makefile.std
deleted file mode 100644
index a7243dee..00000000
--- a/src/makefile.std
+++ /dev/null
@@ -1,566 +0,0 @@
-# File: Makefile
-
-# This is not a very "nice" Makefile, but it usually works.
-
-#
-# Note that you may have to make modifications below according
-# to your machine, available libraries, compilation options,
-# and your "visual module" of choice.  This Makefile is intended
-# for use with Unix machines running X11, Curses, Ncurses, or Vt100,
-# or possibly for "Atari" or "Amiga" computers with "Curses" ports,
-# see below for more information.
-#
-# Note that "main-mac.c" and "main-crb.c", the visual modules for
-# the Macintosh, must be compiled in a special way, see elsewhere.
-#
-# Note that "main-win.c", the visual module for Windows,
-# must be compiled in a special way, see elsewhere.
-#
-# Note that "main-ibm.c" and "main-emx.c", the visual modules
-# for various types of IBM-PC computers, must be compiled with
-# special Makefiles, see elsewhere.
-#
-# Note that "main-lsl.c", the visual module for Linux-SVGALIB
-# must be compiled with "Makefile.lsl", see elsewhere.
-#
-# Note that "main-acn.c", the visual module for Risc Acorn,
-# must be compiled with "Makefile.acn", see elsewhere.
-#
-# Note that "Makefile.wat" is a slight variation on "Makefile.ibm",
-# which allow the use of "main-ibm.c" with special compiler
-# (might be out-of-date).
-#
-# If you are able to construct "main-xxx.c" and/or "Makefile.xxx"
-# files for a currently unsupported system, please send them to me
-# (rr9@angband.org) for inclusion in future versions.
-#
-
-##
-## 1. Installation locations and such
-##
-## LIBDIR, BINDIR and OWNER should be set appropriately for
-## multiuser installations.
-##
-## If you want to keep it private or don't have root privilege
-## required by "make install", set LIBDIR to ./lib/ or an absolute
-## path pointing to your lib directory, and don't run "make install".
-##
-## NOTE: If LIBDIR is set to ./lib/ , you have to cd to parent directory
-## of lib before you start the game.
-##
-
-# Where lib/ files goes
-#LIBDIR = /usr/lib/games/tome/
-# Sysadmins of commercial Unix and/or BSD might prefer this
-#LIBDIR = /usr/local/lib/tome/
-# If you like the old default, use this one
-LIBDIR = ./lib/
-# Another example: single user installation using absolute path
-#LIBDIR = /home/myloginname/lib/tome/
-
-
-# Where ToME binary goes
-BINDIR = /usr/local/games
-# Another common location
-#BINDIR = /usr/local/bin
-
-# The game will run suid to this user
-OWNER = games
-
-# Ignore this if you're not making a package
-DESTDIR=
-
-##
-## 2. Some "system" definitions
-##
-## No changes are needed to compile a version that will run on both
-## X11 and Curses, in debugging mode, with maximal warnings, on many
-## normal Unix machines of the Sun OS variety (non-solaris).
-##
-## To use an "alternative" definition, simply "modify" (or "replace")
-## the definition below with one that you like.  For example, you can
-## change the compiler to "cc", or remove the "debugging" options, or
-## remove the X11 or Curses support, etc, as desired.
-##
-## See also "config.h" and "h-config.h" for important information.
-##
-## Some "examples" are given below, they can be used by simply
-## removing the FIRST column of "#" signs from the "block" of lines
-## you wish to use, and commenting out "standard" block below.
-##
-## This is not intended to be a "good" Makefile, just a "simple" one.
-##
-
-
-#
-# This is my compiler of choice, it seems to work most everywhere
-#
-CC = gcc
-
-# Profiling options
-# PROFILECOPTS = -pg
-# PROFILELDFLAGS = -pg
-
-#
-# Standard version (see main-x11.c)
-#
-# This version supports "X11" only.
-#
-# You may have to add various X11 include/library directories to the
-# "INCLUDES", if your machine places files in a weird location
-# (e.g. -I/usr/X11R6/include, as is almost always the case with
-# linux and *BSD). Since we have seen many linux users -- arguably
-# the largest unix population -- confused by this, and adding this
-# usually doesn't hurt, the default rule has been changed to search
-# for /usr/X11R6/include.
-#
-# You may be able to remove "-ltermcap" on some machines (ex: Solaris).
-#
-# You may have to replace "-lcurses" with "-lncurses" to use the
-# "new curses" library instead of the "old curses" library, and
-# you may have to add "-I/usr/include/ncurses" to the "INCLUDES",
-# and/or "-DUSE_NCURSES" to "DEFINES".
-#
-# See "main-gcu.c" and "config.h" for some optional "curses" defines,
-# including "USE_GETCH" and "USE_CURS_SET".  Note that "config.h" will
-# attempt to "guess" at many of these flags based on your system.
-#
-COPTS = -Wall -O1 -Wno-unused-value -pipe -g
-INCLUDES = -I/usr/X11R6/include
-DEFINES = -DUSE_X11 \
-	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
-LIBS = -L/usr/X11R6/lib -lX11
-
-##
-## Variation -- Only support "main-gtk2.c" (not "main-gcu.c, main-x11.c")
-## this variation uses pkg-config and gnu make
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = $(shell pkg-config --cflags-only-I gtk+-2.0)
-#DEFINES = -DUSE_GTK2 -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = $(shell pkg-config --libs gtk+-2.0)
-#GTK_SRC_FILE= main-gtk2.c
-#GTK_OBJ_FILE= main-gtk2.o
-
-##
-## Variation -- Only support "main-gtk2.c" (not "main-gcu.c, main-x11.c")
-## this variation uses pkg-config
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `pkg-config --cflags-only-I gtk+-2.0`
-#DEFINES = -DUSE_GTK2 -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = `pkg-config --libs gtk+-2.0`
-#GTK_SRC_FILE= main-gtk2.c
-#GTK_OBJ_FILE= main-gtk2.o
-
-##
-## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-## this variation uses pkg-config
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `pkg-config --cflags-only-I gtk+-2.0`
-#DEFINES = -DUSE_GTK -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = `pkg-config --libs gtk+-2.0`
-#GTK_SRC_FILE= main-gtk.c
-#GTK_OBJ_FILE= main-gtk.o
-
-##
-## Variation -- Only support "main-gtk.c" (not "main-gcu.c, main-x11.c")
-## this variation uses gtk-config
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `gtk-config --cflags`
-#DEFINES = -DUSE_GTK -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = `gtk-config --libs`
-#GTK_SRC_FILE= main-gtk.c
-#GTK_OBJ_FILE= main-gtk.o
-
-##
-## Variation -- Both "main-x11.c" and "main-gcu.c" in a single executable.
-##
-## Your Unix system's curses library may be called "-lcurses" instead of
-## "-lncurses", and you may also need to add "-ltermlib" to the end of the
-## LIBS on some platforms.
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS \
-#	-DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-#	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
-#LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-
-
-##
-## Variation -- Only support "main-gcu.c" (not "main-x11.c")
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-
-##
-## Variation -- Use "main-xaw.c" instead of "main-x11.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_XAW -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lXaw -lXmu -lXt -lX11 -lcurses -ltermcap -L/usr/X11R6/lib
-
-##
-## Variation -- Use "main-sdl.c" instead of "main-x11.c"
-##
-#SDL_CONFIG ?= sdl-config
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = `$(SDL_CONFIG) --cflags`
-#DEFINES = -DUSE_SDL -DUSE_GCU \
-#	-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
-#	-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK -DSUPPORT_GAMMA
-#LIBS = `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_ttf -lcurses
-
-##
-## Variation -- Use "main-cap.c" instead of "main-gcu.c"
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_CAP \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -ltermcap
-
-
-##
-## Variation -- Only work on simple vt100 terminals
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_CAP -DUSE_HARDCODE
-
-
-##
-## Variation -- this might work for Linux 1.1.93 using ncurses-1.8.7.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-
-
-##
-## Variation -- this might work better than the suggestion above
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer
-#INCLUDES = -I/usr/X11R6/include -I/usr/include/ncurses
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_TPOSIX -DUSE_CURS_SET \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-#LDFLAGS = -s
-
-
-##
-## Variation -- compile for FreeBSD with ncurses
-## -- BSD curses gives you B&W display.
-##
-#COPTS = -Wall -O2 -fomit-frame-pointer -m486
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DUSE_X11 -DUSE_GCU -DUSE_NCURSES \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lncurses -L/usr/X11R6/lib
-
-
-##
-## Variation -- compile for Solaris
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSOLARIS \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lsocket -lcurses
-
-
-##
-## Variation -- compile for SGI Indigo runnig Irix
-## The SGI has hardware gamma correction.
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DSGI \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS
-#LIBS = -lX11 -lcurses -ltermcap -lsun
-
-##
-## Variation -- compile for Dec ALPHA OSF/1 v2.0
-##
-#CC     = cc
-##COPTS = -std -O -g3 -Olimit 4000
-#COPTS = -std -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS   = -lX11 -lcurses -ltermcap -lrpcsvc
-
-
-##
-## Variation -- compile for Interactive Unix (ISC) systems
-##
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES =
-#DEFINES = -DUSE_X11 -DUSE_GCU -DISC \
-#	-DUSE_TRANSPARENCY -DUSE_EGO_GRAPHICS -DSUPPORT_GAMMA
-#LIBS = -lX11 -lcurses -lnsl_s -linet -lcposix
-
-
-##
-## Variation -- Support fat binaries under NEXTSTEP
-##
-#COPTS = -Wall -O1 -pipe -g -arch m68k -arch i386
-#INCLUDES =
-#DEFINES = -DUSE_GCU
-#LIBS = -lcurses -ltermcap
-
-#
-# Variation -- compile for 64 bit machines where the size of long is 64 bits.
-#
-# On some machines it may be necessary to change the -L directory so that
-# it points at a library directory containing 64-bit libraries. For example,
-# on Suse 10.x you need to change it to:  -L/usr/X11R6/lib64.
-#
-#COPTS = -Wall -O1 -pipe -g
-#INCLUDES = -I/usr/X11R6/include
-#DEFINES = -DLUA_NUM_TYPE=int -DUSE_X11 \
-#		-DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY -DSUPPORT_GAMMA \
-#		-DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK
-#LIBS = -L/usr/X11R6/lib -lX11
-
-### End of configurable section ###
-
-#
-# The "source" and "object" files.
-#
-
-BASESRCS = \
-  $(GTK_SRC_FILE) main-gcu.c main-x11.c main-xaw.c main-sdl.c \
-  z-rand.c z-util.c z-form.c z-virt.c z-term.c z-sock.c \
-  variable.c tables.c plots.c util.c cave.c dungeon.c \
-  melee1.c melee2.c modules.c \
-  object1.c object2.c randart.c squeltch.c traps.c \
-  monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c skills.c powers.c gods.c \
-  spells1.c spells2.c \
-  status.c files.c notes.c loadsave.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  help.c \
-  generate.c gen_maze.c gen_evol.c wild.c levels.c store.c bldg.c \
-  cmovie.c irc.c \
-  wizard2.c init2.c birth.c wizard1.c init1.c main.c
-
-BASEOBJS = \
-  $(GTK_OBJ_FILE) main-gcu.o main-x11.o main-xaw.o main-sdl.o main-dmy.o \
-  z-rand.o z-util.o z-form.o z-virt.o z-term.o z-sock.o \
-  variable.o tables.o plots.o util.o cave.o dungeon.o \
-  melee1.o melee2.o modules.o \
-  object1.o object2.o randart.o squeltch.o traps.o \
-  monster1.o monster2.o monster3.o \
-  xtra1.o xtra2.o skills.o powers.o gods.o \
-  spells1.o spells2.o \
-  status.o files.o notes.o loadsave.o \
-  cmd1.o cmd2.o cmd3.o cmd4.o cmd5.o cmd6.o cmd7.o \
-  help.o \
-  generate.o gen_maze.o gen_evol.o wild.o levels.o store.o bldg.o \
-  cmovie.o irc.o \
-  wizard2.o init2.o birth.o wizard1.o init1.o main.o
-
-LUASRCS = \
-  script.c lua_bind.c \
-  w_util.c w_player.c w_z_pack.c w_obj.c w_mnster.c w_spells.c w_quest.c w_play_c.c w_dun.c
-
-TOLUASRCS = \
-  lua/lapi.c lua/lcode.c lua/ldebug.c lua/ldo.c lua/lfunc.c lua/lgc.c \
-  lua/llex.c lua/lmem.c lua/lobject.c lua/lparser.c lua/lstate.c lua/lstring.c \
-  lua/ltable.c lua/ltests.c lua/ltm.c lua/lundump.c lua/lvm.c lua/lzio.c \
-  lua/lauxlib.c lua/lbaselib.c lua/ldblib.c lua/liolib.c lua/lstrlib.c \
-  lua/tolua_lb.c lua/tolua_rg.c lua/tolua_tt.c lua/tolua_tm.c lua/tolua_gp.c \
-  lua/tolua_eh.c lua/tolua_bd.c
-
-LUAOBJS = \
-  script.o lua_bind.o \
-  w_util.o w_player.o w_z_pack.o w_obj.o w_mnster.o w_spells.o w_quest.o w_play_c.o w_dun.o
-
-TOLUAOBJS = \
-  lua/lapi.o lua/lcode.o lua/ldebug.o lua/ldo.o lua/lfunc.o lua/lgc.o \
-  lua/llex.o lua/lmem.o lua/lobject.o lua/lparser.o lua/lstate.o lua/lstring.o \
-  lua/ltable.o lua/ltests.o lua/ltm.o lua/lundump.o lua/lvm.o lua/lzio.o \
-  lua/lauxlib.o lua/lbaselib.o lua/ldblib.o lua/liolib.o lua/lstrlib.o \
-  lua/tolua_lb.o lua/tolua_rg.o lua/tolua_tt.o lua/tolua_tm.o lua/tolua_gp.o \
-  lua/tolua_eh.o lua/tolua_bd.o
-
-#
-# Base sources and objects
-#
-
-SRCS = $(BASESRCS)
-OBJS = $(BASEOBJS)
-
-
-#
-# Compiler options
-#
-
-CFLAGS = $(COPTS) $(PROFILECOPTS) $(INCLUDES) $(DEFINES) -DDEFAULT_PATH=\"$(LIBDIR)\"
-
-
-#
-# Lua support
-#
-
-INCLUDES += -Ilua -I.
-DEFINES += -DUSE_LUA
-SRCS = $(LUASRCS) $(TOLUASRCS) $(BASESRCS)
-OBJS = $(LUAOBJS) $(TOLUAOBJS) $(BASEOBJS)
-
-# Force recreation of stub files when lua source files are updated
-# To be included in dependency rules
-TOLUADEP = $(TOLUA) $(TOLUASRCS) lua/tolua.c lua/tolualua.c
-
-#
-# IRC support
-#
-
-IRC_SERVER=irc.worldirc.org
-IRC_PORT=6667
-IRC_CHANNEL=\#tome
-
-DEFINES += \
-	-DIRC_SERVER=\"$(IRC_SERVER)\" \
-	-DIRC_PORT=\"$(IRC_PORT)\" \
-	-DIRC_CHANNEL=\"$(IRC_CHANNEL)\"
-
-# Build the binary. The new base target.
-#
-
-TARGET = tome
-
-TOLUA = ./tolua
-
-default: $(TOLUA) $(TARGET)
-	@echo "*** Note: In order to use the install rule, which now actually"
-	@echo "*** handles the installation of the library dir, you need to edit"
-	@echo "*** this makefile, going to the top and making sure LIBDIR suits"
-	@echo "*** your desired install dir properly. The LIBRARY_DIR you used"
-	@echo "*** to set in config.h is now ignored and obsolete with respect"
-	@echo "*** to this makefile. Note that if you edit this makefile, you may"
-	@echo "*** need to recompile so all the files that reference those defines"
-	@echo "*** notice the changes."
-
-$(TARGET): $(OBJS)
-	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
-	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-
-#
-# An install rule.
-#
-mini_install: default
-	cp -f $(TARGET) ..
-
-install: default
-	[ -d $(DESTDIR)$(LIBDIR) ] || mkdir -p $(DESTDIR)$(LIBDIR)
-	[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
-	cp -r ../lib/* $(DESTDIR)$(LIBDIR)
-	chown -R $(OWNER) $(DESTDIR)$(LIBDIR)
-	cp -f $(TARGET) $(DESTDIR)$(BINDIR)/$(TARGET)
-	chown $(OWNER) $(DESTDIR)$(BINDIR)/$(TARGET)
-	chmod 4755 $(DESTDIR)$(BINDIR)/$(TARGET)
-
-# old-install: $(TARGET)
-#	cp $(TARGET) ..
-
-
-#
-# Clean up old junk
-#
-
-clean:
-	rm -f *.bak *.o lua/*.o w_*.c $(TOLUA) $(TARGET)
-
-
-# Make a src dist
-TARGET_VERSION=`fgrep '[V]' ../changes.txt | sed 's/\[V\]-*\s*T.o.M.E \(.\).\(.\).\(.\) .*/\1\2\3/g'`
-DIST_TARGET_VERSION=../dist/tome-$(TARGET_VERSION)-src
-DIST_TARGET=../dist/tome-xxx-src
-dist: clean
-	mkdir -p $(DIST_TARGET)
-	cp -r ../lib $(DIST_TARGET)
-	cp -r ../src $(DIST_TARGET)
-	../tome -c ../changes.txt $(DIST_TARGET)/changes.txt
-	cp ../changes.old $(DIST_TARGET)
-	cp ../credits.txt $(DIST_TARGET)
-	cp ../tome.ini $(DIST_TARGET)
-	cp ../angdos.cfg $(DIST_TARGET)
-	rm -f $(DIST_TARGET)/src/tome $(DIST_TARGET)/src/tolua
-	find $(DIST_TARGET) -name '*~' -exec rm {} \;
-	find $(DIST_TARGET)/lib/data/ -name '*.raw' -exec rm {} \;
-	find $(DIST_TARGET)/lib/xtra/graf/ -name '*.gif' -exec rm {} \;
-	find $(DIST_TARGET)/lib/xtra/font/ -name '*.hex' -exec rm {} \;
-	rm -rf `find $(DIST_TARGET) -name 'CVS'`
-	rm -rf `find $(DIST_TARGET)/lib/mods/ -mindepth 1 -maxdepth 1 -type d`
-	sed -i 's/(CVS)//' $(DIST_TARGET)/src/defines.h
-	mv $(DIST_TARGET) $(DIST_TARGET_VERSION)
-	cd ../dist; tar -cvjf tome-$(TARGET_VERSION)-src.tar.bz2 tome-$(TARGET_VERSION)-src
-
-#
-# Generate dependancies automatically
-#
-
-depend:
-	makedepend $(INCLUDES) $(DEFINES) -D__MAKEDEPEND__ $(SRCS)
-
-.c.o:
-	$(CC) $(CFLAGS) -c -o $*.o $*.c
-
-
-#
-# Quests
-#
-plots.o: q_rand.c q_main.c q_one.c q_ultrag.c q_ultrae.c \
-	q_thief.c q_hobbit.c q_nazgul.c q_troll.c q_wight.c \
-	q_spider.c q_poison.c \
-	q_eol.c q_nirna.c q_invas.c \
-	q_betwen.c \
-	q_narsil.c q_shroom.c q_thrain.c q_wolves.c q_dragons.c q_haunted.c q_evil.c
-
-#
-# Lua library compilation rules
-#
-
-w_mnster.c: monster.pkg $(TOLUADEP)
-	$(TOLUA) -n monster -o w_mnster.c monster.pkg
-
-w_player.c: player.pkg $(TOLUADEP)
-	$(TOLUA) -n player -o w_player.c player.pkg
-
-w_play_c.c: player_c.pkg $(TOLUADEP)
-	$(TOLUA) -n player_c -o w_play_c.c player_c.pkg
-
-w_z_pack.c: z_pack.pkg $(TOLUADEP)
-	$(TOLUA) -n z_pack -o w_z_pack.c z_pack.pkg
-
-w_obj.c: object.pkg $(TOLUADEP)
-	$(TOLUA) -n object -o w_obj.c object.pkg
-
-w_util.c: util.pkg $(TOLUADEP)
-	$(TOLUA) -n util -o w_util.c util.pkg
-
-w_spells.c: spells.pkg $(TOLUADEP)
-	$(TOLUA) -n spells -o w_spells.c spells.pkg
-
-w_quest.c: quest.pkg $(TOLUADEP)
-	$(TOLUA) -n quest -o w_quest.c quest.pkg
-
-w_dun.c: dungeon.pkg $(TOLUA)
-	$(TOLUA) -n dungeon -o w_dun.c dungeon.pkg
-
-# DO NOT DELETE THIS LINE - make depend depends on it.
diff --git a/src/makefile.win b/src/makefile.win
deleted file mode 100644
index e2d34337..00000000
--- a/src/makefile.win
+++ /dev/null
@@ -1,206 +0,0 @@
-# File: Makefile.win
-
-# For Borland C++ 4.52 Win16 and Win32
-
-.autodepend
-
-# change this to suit your taste
-
-CC = c:\apps\bc45\bin\bcc.exe +bccw16.cfg
-CC32 = c:\apps\bc45\bin\bcc32.exe +bccw32.cfg
-LINK = c:\apps\bc45\bin\tlink.exe
-LINK32 = c:\apps\bc45\bin\tlink32.exe
-RC = c:\apps\bc45\bin\brc.exe
-RC32 = c:\apps\bc45\bin\brc32.exe
-LIBDIR = c:\apps\bc45\lib
-INCLDIR = c:\apps\bc45\include;c:\angband\ext-win\src
-
-# shouldn't need to change anything below
-
-SRCS = \
-  z-util.c z-virt.c z-form.c z-rand.c z-term.c z-sock.c \
-  variable.c tables.c util.c cave.c cmovie.c modules.c \
-  object1.c object2.c traps.c monster1.c monster2.c monster3.c \
-  xtra1.c xtra2.c spells1.c spells2.c \
-  melee1.c melee2.c files.c plots.c help.c \
-  cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
-  status.c randart.c gods.c \
-  store.c birth.c loadsave.c notes.c squeltch.c \
-  wizard1.c wizard2.c levels.c \
-  generate.c gen_maze.c gen_evol.c dungeon.c init1.c init2.c \
-  main-win.c readdib.c \
-  bldg.c wild.c powers.c
-
-OBJS = \
-  z-util.obj z-virt.obj z-form.obj z-rand.obj z-term.obj z-sock.obj \
-  variable.obj tables.obj util.obj cave.obj cmovie.obj modules.obj \
-  object1.obj object2.obj traps.obj monster1.obj monster2.obj monster3.obj \
-  xtra1.obj xtra2.obj spells1.obj spells2.obj \
-  melee1.obj melee2.obj files.obj plots.obj help.obj \
-  cmd1.obj cmd2.obj cmd3.obj cmd4.obj cmd5.obj cmd6.obj cmd7.obj \
-  status.obj randart.obj gods.obj \
-  store.obj birth.obj loadsave.obj notes.obj squeltch.obj \
-  wizard1.obj wizard2.obj levels.obj \
-  generate.obj gen_maze.obj gen_evol.obj dungeon.obj init1.obj init2.obj \
-  main-win.obj readdib.obj \
-  bldg.obj wild.obj powers.obj
-
-OBJS32 = \
-  z-util.o32 z-virt.o32 z-form.o32 z-rand.o32 z-term.o32 z-sock.o32 \
-  variable.o32 tables.o32 util.o32 cave.o32 cmovie.o32 modules.o32 \
-  object1.o32 object2.o32 traps.o32 monster1.o32 monster2.o32 monster3.o32 \
-  xtra1.o32 xtra2.o32 spells1.o32 spells2.o32 \
-  melee1.o32 melee2.o32 files.o32 plots.o32 help.o32 \
-  cmd1.o32 cmd2.o32 cmd3.o32 cmd4.o32 cmd5.o32 cmd6.o32 cmd7.o32 \
-  status.o32 randart.o32 gods.o32 \
-  store.o32 birth.o32 loadsave.o32 notes.o32 squeltch.o32 \
-  wizard1.o32 wizard2.o32 levels.o32 \
-  generate.o32 gen_maze.o32 gen_evol.o32 dungeon.o32 init1.o32 init2.o32 \
-  main-win.o32 readdib.o32 \
-  bldg.o32 wild.o32
-
-default: bccw16.cfg angband cleanobj bccw32.cfg angband32 cleanobj32
-
-clean:
-	del *.obj
-	del ..\*.map
-	del ..\angband.exe
-
-cleanobj:
-	del *.obj
-	del bccw16.cfg
-
-cleanobj32:
-	del *.o32
-	del bccw32.cfg
-
-bccw16.cfg: makefile.win
-	if not exist ..\angband.ini copy ..\ext-win\src\angband.ini ..
-	copy &&|
--I$(INCLDIR)
--L$(LIBDIR)
--ml
--WE
--x-
--K
--y-
--v-
--N-
--f-
--3
--dc
--Ff=8
--r
--b-
--p-
--Os
--Oa
--OW
--O
--d
--Ob
--Oe
--Og
--Ol
--Om
--Ot
--Op
--Ov
--k-
--Z
--w-
--X
--D__STDC__=1
-| bccw16.cfg
-
-bccw32.cfg: makefile.win
-	copy &&|
--I$(INCLDIR)
--L$(LIBDIR)
--WE
--x-
--K
--y-
--v-
--N-
--f-
--5
--r
--b-
--p-
--Os
--OW
--O
--d
--Oa
--Ob
--Oe
--Og
--Ol
--Om
--Ot
--Op
--Ov
--k-
--Z
--w-
--X
--D__STDC__=1
-| bccw32.cfg
-
-.c.obj:
-	$(CC) -c $<
-
-generate.obj: generate.c
-	$(CC) -c generate.c
-
-readdib.obj: ..\ext-win\src\readdib.c ..\ext-win\src\readdib.h
-	$(CC) -c ..\ext-win\src\readdib.c
-
-angband: $(OBJS) ..\ext-win\src\angband.rc
-	$(LINK) /L$(LIBDIR) @&&|
--Twe -P -d -x -Gn -Oc -yx4096 +
-c0wl+
-z-util z-virt z-form z-rand z-term z-sock +
-variable tables util cave cmovie modules +
-object1 object2 traps monster1 monster2 monster3 +
-xtra1 xtra2 spells1 spells2 +
-melee1 melee2 files plots help +
-cmd1 cmd2 cmd3 cmd4 cmd5 cmd6 cmd7 +
-status randart gods +
-store birth loadsave notes squeltch +
-wizard1 wizard2 levels +
-generate gen_maze gen_evol dungeon init1 init2 +
-main-win readdib bldg wild powers +
-..\angband.exe,..\angband.map,import cwl,..\ext-win\src\angband.def
-|
-	$(RC) -31 ..\ext-win\src\angband.rc ..\angband.exe
-
-.c.o32:
-	$(CC32) -c -o$@ $<
-
-# bug in BC4.5 optimizer scrambles town level
-generate.o32: generate.c
-	$(CC32) -c -ogenerate.o32 -O- generate.c
-
-readdib.o32: ..\ext-win\src\readdib.c ..\ext-win\src\readdib.h
-	$(CC32) -c -oreaddib.o32 ..\ext-win\src\readdib.c
-
-angband32: $(OBJS32) ..\ext-win\src\angband.rc
-	$(LINK32) /L$(LIBDIR) @&&|
--aa -B:0x400000 -S:0x100000 -P -x +
-c0w32 +
-z-util.o32 z-virt.o32 z-form.o32 z-rand.o32 z-term.o32 z-sock.o32 +
-variable.o32 tables.o32 util.o32 cave.o32 cmovie.o32 modules.o32 +
-object1.o32 object2.o32 traps.o32 monster1.o32 monster2.o32 monster3.o32 +
-xtra1.o32 xtra2.o32 spells1.o32 spells2.o32 +
-melee1.o32 melee2.o32 files.o32 plots.o32 help.o32 +
-cmd1.o32 cmd2.o32 cmd3.o32 cmd4.o32 cmd5.o32 cmd6.o32 cmd7.o32 +
-status.o32 randart.o32 gods.o32 +
-store.o32 birth.o32 loadsave.o32 notes.o32 squeltch.o32 +
-wizard1.o32 wizard2.o32 levels.o32 +
-generate.o32 gen_maze.o32 gen_evol.o32 dungeon.o32 init1.o32 init2.o32 +
-main-win.o32 readdib.o32 bldg.o32 wild.o32 powers.o32+
-..\angband32.exe,..\angband.map,import32 cw32,..\ext-win\src\angband.def
-|
-	$(RC32) -w32 ..\ext-win\src\angband.rc ..\angband32.exe
diff --git a/src/modules.c b/src/modules.c
index 1555eff3..ceb3e81d 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -174,9 +174,6 @@ bool select_module()
 {
 	s32b k, sel, max;
 
-	/* Hack */
-	use_color = TRUE;
-
 	/* Init some lua */
 	init_lua();
 
diff --git a/src/monster1.c b/src/monster1.c
index 5da7d478..7a44ffab 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -1565,10 +1565,6 @@ static void roff_name(int r_idx, int ego)
 	a1 = r_ptr->d_attr;
 	a2 = r_ptr->x_attr;
 
-	/* Hack -- fake monochrome */
-	if (!use_color) a1 = TERM_WHITE;
-	if (!use_color) a2 = TERM_WHITE;
-
 	/* A title (use "The" for non-uniques) */
 	if (!(r_ptr->flags1 & (RF1_UNIQUE)))
 	{
diff --git a/src/object.pkg b/src/object.pkg
index 0141b5f1..a89dad9a 100644
--- a/src/object.pkg
+++ b/src/object.pkg
@@ -1165,7 +1165,5 @@ extern byte value_check_aux1(object_type *o_ptr);
 extern byte value_check_aux1_magic(object_type *o_ptr);
 extern byte value_check_aux2(object_type *o_ptr);
 extern byte value_check_aux2_magic(object_type *o_ptr);
-extern byte select_sense(object_type *o_ptr, bool ok_combat, bool ok_magic);
-extern bool psychometry(void);
 
 extern bool remove_curse_object(object_type *o_ptr, bool all);
diff --git a/src/object1.c b/src/object1.c
index 0592eb8a..acdc9a77 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -6125,6 +6125,7 @@ bool get_item_floor(int *cp, cptr pmt, cptr str, int mode)
 bool get_item(int *cp, cptr pmt, cptr str, int mode)
 {
 	automatizer_create = FALSE;
+        command_see = TRUE; /* Start out displaying all alternatives. */
 
 	return get_item_floor(cp, pmt, str, mode);
 }
@@ -6357,6 +6358,9 @@ void object_pickup(int this_o_idx)
 
 			/* Delete the object */
 			delete_object_idx(this_o_idx);
+
+                        /* Sense object. */
+                        sense_inventory();
 		}
 	}
 }
diff --git a/src/q_invas.c b/src/q_invas.c
index 1e916fd6..5365c72b 100644
--- a/src/q_invas.c
+++ b/src/q_invas.c
@@ -102,38 +102,8 @@ bool quest_invasion_turn_hook(char *fmt)
 	cmsg_print(TERM_YELLOW, "A Thunderlord appears in front of you and says:");
 	cmsg_print(TERM_YELLOW, "'Hello, noble hero. I am Liron, rider of Tolan. Turgon, King of Gondolin sent me.'");
 	cmsg_print(TERM_YELLOW, "'Gondolin is being invaded; he needs your help now or everything will be lost.'");
-	cmsg_print(TERM_YELLOW, "'I can bring you to Gondolin, but we must go now.'");
-	/* This is SO important a question that flush pending inputs */
-	flush();
+	cmsg_print(TERM_YELLOW, "'Please come quickly!'");
 
-	if (!get_check("Will you come?"))
-	{
-		cmsg_print(TERM_YELLOW, "'Turgon overestimated you... Now Gondolin will fall.'");
-		cmsg_print(TERM_YELLOW, "'I will return alone and die there. May you be doomed!'");
-
-		cquest.status = QUEST_STATUS_FAILED;
-		town_info[2].destroyed = TRUE;
-
-		quick_messages = old_quick_messages;
-
-		del_hook(HOOK_END_TURN, quest_invasion_turn_hook);
-		process_hooks_restart = TRUE;
-		return (FALSE);
-	}
-	cmsg_print(TERM_YELLOW, "'You made the right decision! Quickly, jump on Tolan!'");
-	cmsg_print(TERM_YELLOW, "'Here we are: Gondolin. You must speak with Turgon now.'");
-
-	p_ptr->wild_mode = FALSE;
-	p_ptr->wilderness_x = 49;
-	p_ptr->wilderness_y = 11;
-	p_ptr->town_num = 2;
-	p_ptr->oldpx = p_ptr->px = 117;
-	p_ptr->oldpy = p_ptr->py = 24;
-	dun_level = 0;
-	p_ptr->leaving = TRUE;
-
-	cmsg_print(TERM_YELLOW, "'Turgon hails you.'");
-	quest_describe(QUEST_INVASION);
 	cquest.status = QUEST_STATUS_TAKEN;
 
 	quick_messages = old_quick_messages;
diff --git a/src/spells1.c b/src/spells1.c
index 4d088f6c..58b102cf 100644
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1123,7 +1123,7 @@ byte spell_color(int type)
 	}
 
 	/* Normal tiles or ASCII */
-	else if (use_color)
+	else
 	{
 		/* Analyze */
 		switch (type)
@@ -9237,20 +9237,18 @@ void generate_spell(int plev)
 	power = rand_int(15);
 
 	dice = plev / 5;
-	sides = plev * 2;
+	sides = plev;
 	mana = plev;
 
 	/* Make the spell more or less powerful. */
-	dice += power / 5;
-	sides += power / 2;
-	mana += (plev * power) / 8;
+	dice += power;
+	sides += power;
+	mana += (plev * power) / 15;
 
 	/* Stay within reasonable bounds. */
 	if (dice < 1) dice = 1;
-	if (dice > 10) dice = 10;
 
 	if (sides < 5) sides = 5;
-	if (sides > 100) sides = 100;
 
 	if (mana < 1) mana = 1;
 
@@ -9267,8 +9265,9 @@ void generate_spell(int plev)
 	if (plev == 1 || chance < 25)
 	{
 		rspell->proj_flags |= PROJECT_STOP;
-		rspell->dam_dice = dice;
-		rspell->dam_sides = sides;
+                /* Swap dice and sides for better damage */
+		rspell->dam_dice = sides;
+		rspell->dam_sides = dice;
 		rspell->radius = 0;
 	}
 	else if (chance < 50)
@@ -9281,9 +9280,9 @@ void generate_spell(int plev)
 	else if (chance < 76)
 	{
 		rspell->proj_flags |= PROJECT_STOP;
-		rspell->radius = dice;
-		rspell->dam_dice = sides;
-		rspell->dam_sides = 1;
+		rspell->radius = dice / 3;
+		rspell->dam_dice = dice;
+		rspell->dam_sides = sides;
 		ball_desc = TRUE;
 	}
 	else if (chance < 83)
@@ -9299,8 +9298,9 @@ void generate_spell(int plev)
 	else if (chance < 90)
 	{
 		rspell->proj_flags |= PROJECT_METEOR_SHOWER;
-		rspell->dam_dice = dice;
-		rspell->dam_sides = sides;
+                /* Area effect spells do way less damage "per shot" */
+		rspell->dam_dice = dice / 5;
+		rspell->dam_sides = sides / 5;
 		rspell->radius = sides / 3;
 		if (rspell->radius < 4) rspell->radius = 4;
 
@@ -9309,8 +9309,9 @@ void generate_spell(int plev)
 	else
 	{
 		rspell->proj_flags |= PROJECT_VIEWABLE;
+                /* View spells do less damage */
 		rspell->dam_dice = dice;
-		rspell->dam_sides = sides;
+		rspell->dam_sides = sides / 2;
 	}
 
 	/* Both a destructive and a simple spell requested --
diff --git a/src/squeltch.c b/src/squeltch.c
index 35d4387e..72a84f45 100644
--- a/src/squeltch.c
+++ b/src/squeltch.c
@@ -333,11 +333,11 @@ void do_cmd_automatizer()
 			}
 			else if (c == 'n')
 			{
-				char name[20];
+				char name[20] = { '\0' };
 				char typ;
 
 				sprintf(name, "No name");
-				if (input_box("Name?", hgt / 2, wid / 2, name, 15))
+				if (input_box("Name?", hgt / 2, wid / 2, name, sizeof(name)+1))
 				{
 					cptr styp = "nothing";
 					typ = msg_box("[D]estroy, [P]ickup, [I]nscribe, [N]othing rule?", hgt / 2, wid / 2);
@@ -350,10 +350,10 @@ void do_cmd_automatizer()
 			}
 			else if (c == 's')
 			{
-				char name[30];
+				char name[30] = { '\0' };
 
 				sprintf(name, "automat.atm");
-				if (input_box("Save name?", hgt / 2, wid / 2, name, sizeof(name)))
+				if (input_box("Save name?", hgt / 2, wid / 2, name, sizeof(name)+1))
 				{
 					char buf[1025];
 					char ch;
diff --git a/src/tables.c b/src/tables.c
index 6c83ee04..44973287 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1407,9 +1407,6 @@ option_type option_info[] =
 	  "ring_bell", "Audible bell (on errors, etc)" },
 	/* Changed to default to FALSE -- it's so extremely annoying!!! -TY */
 
-	{ &use_color, TRUE, 1, 19,
-	  "use_color", "Use color if possible (slow)" },
-
 	/*** Disturbance ***/
 
 	{ &find_ignore_stairs, FALSE, 2, 0,
@@ -1520,9 +1517,6 @@ option_type option_info[] =
 	{ &flow_by_sound, FALSE, 3, 10,
 	  "flow_by_sound", "Monsters chase current location (v.slow)" },
 
-	{ &flow_by_smell, FALSE, 3, 11,
-	  "flow_by_smell", "Monsters chase recent locations (v.slow)" },
-
 	{ &player_symbols, FALSE, 3, 12,
 	  "player_symbols", "Use special symbols for the player char"},
 
@@ -1579,9 +1573,6 @@ option_type option_info[] =
 	{ &fresh_message, FALSE, 4, 9,
 	  "fresh_message", "Flush output after every message" },
 
-	{ &compress_savefile, TRUE, 4, 10,
-	  "compress_savefile", "Compress messages in savefiles" },
-
 	{ &hilite_player, FALSE, 4, 11,
 	  "hilite_player", "Hilite the player with the cursor" },
 
@@ -1602,13 +1593,6 @@ option_type option_info[] =
 
 	/*** ToME options ***/
 
-#if 0 /* It's controlled by insanity instead :) - pelpel */
-
-	{ &flavored_attacks, TRUE, 5, 0,
-	  "flavored_attacks", "Show silly messages when fighting" },
-
-#endif /* 0 */
-
 	{ &option_ingame_help, TRUE, 5, 1,
 	  "ingame_help", "Ingame contextual help" },
 
@@ -1653,9 +1637,6 @@ option_type option_info[] =
 	{ &special_lvls, TRUE, 6, 4,
 	  "special_lvls", "Allow the use of special, unique, levels" },
 #endif
-	{ &permanent_levels, FALSE, 6, 5,
-	  "permanent_levels", "Generate persistent dungeons [EXPERIMENTAL]" },
-
 	{ &ironman_rooms, FALSE, 6, 6,
 	  "ironman_rooms", "Always generate very unusual rooms" },
 
@@ -2578,7 +2559,7 @@ magic_power mindcraft_powers[MAX_MINDCRAFT_POWERS] =
 	{
 		15, 12, 60,
 		"Psychometry",
-		"Senses/identifies objects."
+		"Identifies objects."
 	},
 	{
 		/* Ball -> LOS */
diff --git a/src/util.c b/src/util.c
index 3021efa8..5d178780 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2605,9 +2605,6 @@ static void msg_flush(int x)
 {
 	byte a = TERM_L_BLUE;
 
-	/* Hack -- fake monochrome */
-	if (!use_color) a = TERM_WHITE;
-
 	/* Pause for response */
 	Term_putstr(x, 0, -1, a, "-more-");
 
@@ -2906,9 +2903,6 @@ void cmsg_format(byte color, cptr fmt, ...)
 */
 void c_put_str(byte attr, cptr str, int row, int col)
 {
-	/* Hack -- fake monochrome */
-	if (!use_color) attr = TERM_WHITE;
-
 	/* Position cursor, Dump the attr/text */
 	Term_putstr(col, row, -1, attr, str);
 }
@@ -2930,9 +2924,6 @@ void put_str(cptr str, int row, int col)
 */
 void c_prt(byte attr, cptr str, int row, int col)
 {
-	/* Hack -- fake monochrome */
-	if (!use_color) attr = TERM_WHITE;
-
 	/* Clear line, position cursor */
 	Term_erase(col, row, 255);
 
@@ -3297,21 +3288,22 @@ bool askfor_aux(char *buf, int len)
 
 	int k = 0;
 
+        int wid, hgt;
+
 	bool done = FALSE;
 
 
 	/* Locate the cursor */
 	Term_locate(&x, &y);
 
-
-	/* Paranoia -- check len */
-	if (len < 1) len = 1;
+        /* Get terminal size */
+        Term_get_size(&wid, &hgt);
 
 	/* Paranoia -- check column */
-	if ((x < 0) || (x >= 80)) x = 0;
+	if ((x < 0) || (x >= wid)) x = 0;
 
 	/* Restrict the length */
-	if (x + len > 80) len = 80 - x;
+	if (x + len > wid) len = wid - x;
 
 
 	/* Paranoia -- Clip the default entry */
diff --git a/src/variable.c b/src/variable.c
index fa42772f..6bc4b04e 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -81,8 +81,6 @@ bool character_icky; 		/* The game is in an icky full screen mode */
 bool character_xtra; 		/* The game is in an icky startup mode */
 
 u32b seed_flavor; 		/* Hack -- consistent object colors */
-u32b seed_town; 			/* Hack -- consistent town layout */
-u32b seed_dungeon;               /* Simulate persisten dungeons */
 
 s16b command_cmd; 		/* Current "Angband Command" */
 
@@ -238,7 +236,6 @@ bool show_choices; 			/* Show choices in certain sub-windows */
 bool show_details; 			/* Show details in certain sub-windows */
 
 bool ring_bell; 				/* Ring the bell (on errors, etc) */
-bool use_color; 				/* Use color if possible (slow) */
 
 bool show_inven_graph; 		/* Show graphics in inventory */
 bool show_equip_graph; 		/* Show graphics in equip list */
@@ -268,9 +265,6 @@ bool speak_unique; 		/* Speaking uniques + shopkeepers */
 bool small_levels; 		/* Allow unusually small dungeon levels */
 bool empty_levels; 		/* Allow empty 'arena' levels */
 bool always_small_level;         /* Small levels */
-#if 0 /* It's controlled by insanity -- pelpel */
-bool flavored_attacks;           /* Show silly messages when fighting */
-#endif
 bool player_symbols; 		/* Use varying symbols for the player char */
 bool plain_descriptions; 	/* Plain object descriptions */
 bool stupid_monsters; 		/* Monsters use old AI */
@@ -301,7 +295,6 @@ bool dungeon_align; 			/* Generate dungeons with aligned rooms */
 bool dungeon_stair; 			/* Generate dungeons with connected stairs */
 
 bool flow_by_sound; 			/* Monsters track new player location */
-bool flow_by_smell; 			/* Monsters track old player location */
 
 bool track_follow; 			/* Monsters follow the player */
 bool track_target; 			/* Monsters target the player */
@@ -327,8 +320,6 @@ bool fresh_before; 			/* Flush output before normal commands */
 bool fresh_after; 			/* Flush output after normal commands */
 bool fresh_message; 			/* Flush output after all messages */
 
-bool compress_savefile; 		/* Compress messages in savefiles */
-
 bool hilite_player; 			/* Hilite the player with the cursor */
 
 bool view_yellow_lite; 		/* Use special colors for torch-lit grids */