Remove unused BACT_* values, including Arena code

18 files changed, 22 insertions, 427 deletions

diff --git a/src/birth.cc b/src/birth.cc
index 1e01b4ba..0191c9fc 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -430,11 +430,8 @@ static void get_extra(void)
 	/* Experience factor */
 	p_ptr->expfact = rp_ptr->r_exp + rmp_ptr->r_exp + cp_ptr->c_exp;
 
-	/* Initialize arena and rewards information -KMW- */
-	p_ptr->arena_number = 0;
-	p_ptr->inside_arena = 0;
+	/* Initialize quest */
 	p_ptr->inside_quest = 0;
-	p_ptr->exit_bldg = TRUE;  /* only used for arena now -KMW- */
 
 	/* Hitdice */
 	p_ptr->hitdie = rp_ptr->r_mhp + rmp_ptr->r_mhp + cp_ptr->c_mhp;
diff --git a/src/bldg.cc b/src/bldg.cc
index d9ceac4e..d3910bbf 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -185,119 +185,6 @@ void show_building(store_type *s_ptr)
 }
 
 
-/* reset timed flags */
-static void reset_tim_flags()
-{
-	p_ptr->fast = 0;             /* Timed -- Fast */
-	p_ptr->slow = 0;             /* Timed -- Slow */
-	p_ptr->blind = 0;            /* Timed -- Blindness */
-	p_ptr->paralyzed = 0;        /* Timed -- Paralysis */
-	p_ptr->confused = 0;         /* Timed -- Confusion */
-	p_ptr->afraid = 0;           /* Timed -- Fear */
-	p_ptr->image = 0;            /* Timed -- Hallucination */
-	p_ptr->poisoned = 0;         /* Timed -- Poisoned */
-	p_ptr->cut = 0;              /* Timed -- Cut */
-	p_ptr->stun = 0;             /* Timed -- Stun */
-
-	p_ptr->protevil = 0;         /* Timed -- Protection */
-	p_ptr->protgood = 0;         /* Timed -- Protection */
-	p_ptr->invuln = 0;           /* Timed -- Invulnerable */
-	p_ptr->hero = 0;             /* Timed -- Heroism */
-	p_ptr->shero = 0;            /* Timed -- Super Heroism */
-	p_ptr->shield = 0;           /* Timed -- Shield Spell */
-	p_ptr->blessed = 0;          /* Timed -- Blessed */
-	p_ptr->tim_invis = 0;        /* Timed -- Invisibility */
-	p_ptr->tim_infra = 0;        /* Timed -- Infra Vision */
-
-	p_ptr->oppose_acid = 0;      /* Timed -- oppose acid */
-	p_ptr->oppose_elec = 0;      /* Timed -- oppose lightning */
-	p_ptr->oppose_fire = 0;      /* Timed -- oppose heat */
-	p_ptr->oppose_cold = 0;      /* Timed -- oppose cold */
-	p_ptr->oppose_pois = 0;      /* Timed -- oppose poison */
-
-	p_ptr->confusing = 0;        /* Touch of Confusion */
-}
-
-
-/*
- * arena commands
- */
-static void arena_comm(int cmd)
-{
-	char tmp_str[80];
-
-	monster_race *r_ptr;
-
-	switch (cmd)
-	{
-	case BACT_ARENA:
-		{
-			if (p_ptr->arena_number == MAX_ARENA_MONS)
-			{
-				clear_bldg(5, 19);
-				prt("               Arena Victor!", 5, 0);
-				prt("Congratulations!  You have defeated all before you.", 7, 0);
-				prt("For that, receive the prize: 10,000 gold pieces", 8, 0);
-				prt("", 10, 0);
-				prt("", 11, 0);
-				p_ptr->au += 10000;
-				msg_print("Press the space bar to continue");
-				msg_print(NULL);
-				p_ptr->arena_number++;
-			}
-			else if (p_ptr->arena_number > MAX_ARENA_MONS)
-			{
-				msg_print("You enter the arena briefly and bask in your glory.");
-				msg_print(NULL);
-			}
-			else
-			{
-				p_ptr->inside_arena = TRUE;
-				p_ptr->exit_bldg = FALSE;
-				reset_tim_flags();
-				p_ptr->leaving = TRUE;
-				p_ptr->oldpx = p_ptr->px;
-				p_ptr->oldpy = p_ptr->py;
-				leave_bldg = TRUE;
-			}
-
-			break;
-		}
-
-	case BACT_POSTER:
-		{
-			if (p_ptr->arena_number == MAX_ARENA_MONS)
-				msg_print("You are victorious. Enter the arena for the ceremony.");
-			else if (p_ptr->arena_number > MAX_ARENA_MONS)
-				msg_print("You have won against all foes.");
-			else
-			{
-				r_ptr = &r_info[arena_monsters[p_ptr->arena_number]];
-				strnfmt(tmp_str, 80, "Do I hear any challenges against: %s", r_ptr->name);
-				msg_print(tmp_str);
-				msg_print(NULL);
-			}
-
-			break;
-		}
-
-	case BACT_ARENA_RULES:
-		{
-			/* Save screen */
-			screen_save();
-
-			/* Peruse the arena help file */
-			(void)show_file("arena.txt", NULL, 0, 0);
-
-			/* Load screen */
-			screen_load();
-
-			break;
-		}
-	}
-}
-
-
 /*
  * display fruit for dice slots
  */
@@ -1674,7 +1561,6 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 
 	case BACT_QUEST1:
 	case BACT_QUEST2:
-	case BACT_QUEST3:
 	case BACT_QUEST4:
 		{
 			int y = 1, x = 1;
@@ -1709,21 +1595,11 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 		}
 
 	case BACT_KING_LEGENDS:
-	case BACT_ARENA_LEGENDS:
-	case BACT_LEGENDS:
 		{
 			show_highclass(building_loc);
 			break;
 		}
 
-	case BACT_POSTER:
-	case BACT_ARENA_RULES:
-	case BACT_ARENA:
-		{
-			arena_comm(bact);
-			break;
-		}
-
 	case BACT_IN_BETWEEN:
 	case BACT_CRAPS:
 	case BACT_SPIN_WHEEL:
@@ -2071,7 +1947,6 @@ void do_cmd_bldg(void)
 		if (command == ESCAPE)
 		{
 			leave_bldg = TRUE;
-			p_ptr->inside_arena = FALSE;
 			break;
 		}
 
diff --git a/src/cmd2.cc b/src/cmd2.cc
index f2f310c1..5aa6d233 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -4339,8 +4339,8 @@ void do_cmd_unwalk()
 
 static bool_ tport_vertically(bool_ how)
 {
-	/* arena or quest -KMW- */
-	if ((p_ptr->inside_arena) || (p_ptr->inside_quest))
+	/* quest? */
+	if (p_ptr->inside_quest)
 	{
 		msg_print("There is no effect.");
 		return (FALSE);
diff --git a/src/cmd7.cc b/src/cmd7.cc
index 040e0683..da51bdb4 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -4857,13 +4857,6 @@ void summon_monster(int sumtype)
 	/* Take a turn */
 	energy_use = 100;
 
-	if (p_ptr->inside_arena)
-	{
-		msg_print("This place seems devoid of life.");
-		msg_print(NULL);
-		return;
-	}
-
 	if (summon_specific_friendly(p_ptr->py, p_ptr->px, dun_level + randint(5), sumtype, TRUE))
 	{
 		msg_print("You summon some help.");
diff --git a/src/defines.h b/src/defines.h
index ac6c40cf..f56634eb 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -132,11 +132,6 @@
 #define MAX_RUNES           100
 
 /*
- * Arena constants
- */
-#define MAX_ARENA_MONS		29	/* -KMW- */
-
-/*
  * Total number of stores (see "store.c", etc)
  */
 #define STORE_GENERAL   0
@@ -3864,13 +3859,8 @@
 #define BACT_RESEARCH_ITEM           1
 #define BACT_TOWN_HISTORY            2
 #define BACT_RACE_LEGENDS            3
-#define BACT_GREET_KING              4
 #define BACT_KING_LEGENDS            5
 #define BACT_QUEST1                  6
-#define BACT_POSTER                  8
-#define BACT_ARENA_RULES             9
-#define BACT_ARENA                  10
-#define BACT_ARENA_LEGENDS          11
 #define BACT_IN_BETWEEN             12
 #define BACT_GAMBLE_RULES           13
 #define BACT_CRAPS                  14
@@ -3881,21 +3871,16 @@
 #define BACT_RUMORS                 19
 #define BACT_RESEARCH_MONSTER       20
 #define BACT_COMPARE_WEAPONS        21
-#define BACT_LEGENDS                22
 #define BACT_ENCHANT_WEAPON         23
 #define BACT_ENCHANT_ARMOR          24
 #define BACT_RECHARGE               25
 #define BACT_IDENTS                 26
-#define BACT_LEARN                  27
 #define BACT_HEALING                28
 #define BACT_RESTORE                29
 #define BACT_ENCHANT_ARROWS         30
 #define BACT_ENCHANT_BOW            31
-#define BACT_GREET                  32
 #define BACT_RECALL                 33
 #define BACT_TELEPORT_LEVEL         34
-/* XXX */
-/* XXX */
 #define BACT_MIMIC_NORMAL           37
 #define BACT_VIEW_BOUNTIES          38
 #define BACT_SELL_CORPSES           39
@@ -3907,7 +3892,6 @@
 #define BACT_EXAMINE                45
 #define BACT_STEAL                  46
 #define BACT_QUEST2                 47
-#define BACT_QUEST3                 48
 #define BACT_QUEST4                 49
 #define BACT_STAR_HEAL              50
 #define BACT_DROP_ITEM              54
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 3f28de2f..bc73e810 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -1357,7 +1357,6 @@ static void process_world(void)
 
 	/* Check for creature generation. */
 	if (!p_ptr->wild_mode &&
-	                !p_ptr->inside_arena &&
 	                !p_ptr->inside_quest &&
 	                (rand_int(d_info[(dun_level) ? dungeon_type : DUNGEON_WILDERNESS].max_m_alloc_chance) == 0))
 	{
@@ -3639,13 +3638,6 @@ static void process_command(void)
 			/* No magic in the overworld map */
 			if (p_ptr->wild_mode) break;
 
-			/* Neither in the Arena */
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-
-				break;
-			}
 			do_cmd_activate_skill();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3724,13 +3716,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_activate();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3761,13 +3746,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("You're in the arena now. This is hand-to-hand!");
-				msg_print(NULL);
-				break;
-			}
-
 			j_ptr = &p_ptr->inventory[INVEN_BOW];
 
 			if (j_ptr->tval == TV_BOOMERANG)
@@ -3788,13 +3766,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("You're in the arena now. This is hand-to-hand!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_throw();
 			break;
 		}
@@ -3805,13 +3776,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_aim_wand();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3824,13 +3788,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_zap_rod();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3843,13 +3800,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_quaff_potion();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3883,13 +3833,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_read_scroll();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3902,13 +3845,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_use_staff();
 			squeltch_inventory();
 			squeltch_grid();
@@ -3921,13 +3857,6 @@ static void process_command(void)
 			if (p_ptr->control) break;
 			if (p_ptr->wild_mode) break;
 
-			if (p_ptr->inside_arena)
-			{
-				msg_print("The arena absorbs all attempted magic!");
-				msg_print(NULL);
-				break;
-			}
-
 			do_cmd_power();
 			squeltch_inventory();
 			squeltch_grid();
@@ -5247,7 +5176,6 @@ void play_game(bool_ new_game)
 		if (p_ptr->astral) dun_level = 98;
 		else dun_level = 0;
 		p_ptr->inside_quest = 0;
-		p_ptr->inside_arena = 0;
 
 		/* Hack -- enter the world */
 		/* Mega-hack Vampires and Spectres start in the dungeon */
@@ -5546,7 +5474,6 @@ void play_game(bool_ new_game)
 
 				/* New depth -KMW- */
 				/* dun_level = 0; */
-				p_ptr->inside_arena = 0;
 				leaving_quest = 0;
 				p_ptr->inside_quest = 0;
 
diff --git a/src/externs.h b/src/externs.h
index 5f4003ee..1e051498 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -56,7 +56,6 @@ extern byte adj_dex_safe[];
 extern byte adj_con_fix[];
 extern byte adj_con_mhp[];
 extern byte blows_table[12][12];
-extern s16b arena_monsters[MAX_ARENA_MONS];
 extern byte extract_energy[300];
 extern s32b player_exp[PY_MAX_LEVEL];
 extern player_sex sex_info[MAX_SEXES];
diff --git a/src/files.cc b/src/files.cc
index b2177ed2..39a0cdf2 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -4715,7 +4715,7 @@ static void display_scores_aux(int highscore_fd, int from, int to, int note, hig
 
 			cptr gold, when, aged;
 
-			int in_arena, in_quest;
+			int in_quest;
 
 			/* Hack -- indicate death in yellow */
 			attr = (j == note) ? TERM_YELLOW : TERM_WHITE;
@@ -4751,7 +4751,6 @@ static void display_scores_aux(int highscore_fd, int from, int to, int note, hig
 			cdun = atoi(the_score.cur_dun);
 			mdun = atoi(the_score.max_dun);
 
-			in_arena = atoi(the_score.inside_arena);
 			in_quest = atoi(the_score.inside_quest);
 
 			/* Hack -- extract the gold and such */
@@ -4772,12 +4771,7 @@ static void display_scores_aux(int highscore_fd, int from, int to, int note, hig
 			c_put_str(attr, out_val, n*4 + 2, 0);
 
 			/* Another line of info */
-			if (in_arena)
-			{
-				sprintf(out_val, "               Killed by %s in the Arena",
-				        the_score.how);
-			}
-			else if (in_quest)
+			if (in_quest)
 			{
 				sprintf(out_val, "               Killed by %s while questing",
 				        the_score.how);
@@ -4861,7 +4855,7 @@ void show_highclass(int building)
 {
 
 	int i = 0, j, m = 0;
-	int pr, pc, clev, al;
+	int pr, pc, clev;
 	high_score the_score;
 	char buf[1024], out_val[256];
 	int highscore_fd;
@@ -4929,10 +4923,8 @@ void show_highclass(int building)
 		pr = atoi(the_score.p_r);
 		pc = atoi(the_score.p_c);
 		clev = atoi(the_score.cur_lev);
-		al = atoi(the_score.arena_number);
-		if (((pc == (building - 10)) && (building != 1) && (building != 2)) ||
-		                ((building == 1) && (clev >= PY_MAX_LEVEL)) ||
-		                ((building == 2) && (al > MAX_ARENA_MONS)))
+		if (((pc == (building - 10)) && (building != 1)) ||
+				((building == 1) && (clev >= PY_MAX_LEVEL)))
 		{
 			sprintf(out_val, "%3d) %s the %s (Level %2d)",
 			        (m + 1), the_score.who, rp_name + race_info[pr].title, clev);
@@ -4949,13 +4941,7 @@ void show_highclass(int building)
 		        player_name, rp_name + race_info[p_ptr->prace].title, p_ptr->lev);
 		prt(out_val, (m + 8), 0);
 	}
-	else if ((building == 2) && (p_ptr->arena_number > MAX_ARENA_MONS))
-	{
-		sprintf(out_val, "You) %s the %s (Level %2d)",
-		        player_name, rp_name + race_info[p_ptr->prace].title, p_ptr->lev);
-		prt(out_val, (m + 8), 0);
-	}
-	else if ((building != 1) && (building != 2))
+	else if ((building != 1))
 	{
 		if ((p_ptr->lev > clev) && (p_ptr->pclass == (building - 10)))
 		{
@@ -5182,10 +5168,7 @@ static errr top_twenty(void)
 	sprintf(the_score.max_lev, "%3d", p_ptr->max_plv);
 	sprintf(the_score.max_dun, "%3d", max_dlv[dungeon_type]);
 
-	sprintf(the_score.arena_number, "%3d", p_ptr->arena_number);  /* -KMW- */
-	sprintf(the_score.inside_arena, "%3d", p_ptr->inside_arena);
 	sprintf(the_score.inside_quest, "%3d", p_ptr->inside_quest);
-	sprintf(the_score.exit_bldg, "%3d", p_ptr->exit_bldg);  /* -KMW- */
 
 	/* Save the cause of death (31 chars) */
 	sprintf(the_score.how, "%-.31s", died_from);
@@ -5247,6 +5230,8 @@ errr predict_score(void)
 	}
 
 	/* Clear the record */
+	static_assert(std::is_pod<high_score>::value,
+		      "Cannot memset a non-POD type");
 	memset(&the_score, 0, sizeof(high_score));
 
 	/* Save the version */
@@ -5284,10 +5269,7 @@ errr predict_score(void)
 	sprintf(the_score.max_lev, "%3d", p_ptr->max_plv);
 	sprintf(the_score.max_dun, "%3d", max_dlv[dungeon_type]);
 
-	sprintf(the_score.arena_number, "%3d", p_ptr->arena_number);  /* -KMW- */
-	sprintf(the_score.inside_arena, "%3d", p_ptr->inside_arena);
 	sprintf(the_score.inside_quest, "%3d", p_ptr->inside_quest);
-	sprintf(the_score.exit_bldg, "%3d", p_ptr->exit_bldg);  /* -KMW- */
 
 	/* Hack -- no cause of death */
 	strcpy(the_score.how, "nobody (yet!)");
diff --git a/src/generate.cc b/src/generate.cc
index 593a37cd..c2ab72e2 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -8073,131 +8073,6 @@ static bool_ cave_gen(void)
 }
 
 
-/*
- * Builds the arena after it is entered -KMW-
- */
-static void build_arena(void)
-{
-	int yval, y_height, y_depth, xval, x_left, x_right;
-	int i, j;
-
-	yval = SCREEN_HGT / 2;
-	xval = SCREEN_WID / 2;
-	y_height = yval - 10 + SCREEN_HGT;
-	y_depth = yval + 10 + SCREEN_HGT;
-	x_left = xval - 32 + SCREEN_WID;
-	x_right = xval + 32 + SCREEN_WID;
-
-	for (i = y_height; i <= y_height + 5; i++)
-	{
-		for (j = x_left; j <= x_right; j++)
-		{
-			cave_set_feat(i, j, FEAT_PERM_EXTRA);
-			cave[i][j].info |= (CAVE_GLOW | CAVE_MARK);
-		}
-	}
-	for (i = y_depth; i >= y_depth - 5; i--)
-	{
-		for (j = x_left; j <= x_right; j++)
-		{
-			cave_set_feat(i, j, FEAT_PERM_EXTRA);
-			cave[i][j].info |= (CAVE_GLOW | CAVE_MARK);
-		}
-	}
-	for (j = x_left; j <= x_left + 17; j++)
-	{
-		for (i = y_height; i <= y_depth; i++)
-		{
-			cave_set_feat(i, j, FEAT_PERM_EXTRA);
-			cave[i][j].info |= (CAVE_GLOW | CAVE_MARK);
-		}
-	}
-	for (j = x_right; j >= x_right - 17; j--)
-	{
-		for (i = y_height; i <= y_depth; i++)
-		{
-			cave_set_feat(i, j, FEAT_PERM_EXTRA);
-			cave[i][j].info |= (CAVE_GLOW | CAVE_MARK);
-		}
-	}
-
-	cave_set_feat(y_height + 6, x_left + 18, FEAT_PERM_EXTRA);
-	cave[y_height + 6][x_left + 18].info |= (CAVE_GLOW | CAVE_MARK);
-	cave_set_feat(y_depth - 6, x_left + 18, FEAT_PERM_EXTRA);
-	cave[y_depth - 6][x_left + 18].info |= (CAVE_GLOW | CAVE_MARK);
-	cave_set_feat(y_height + 6, x_right - 18, FEAT_PERM_EXTRA);
-	cave[y_height + 6][x_right - 18].info |= (CAVE_GLOW | CAVE_MARK);
-	cave_set_feat(y_depth - 6, x_right - 18, FEAT_PERM_EXTRA);
-	cave[y_depth - 6][x_right - 18].info |= (CAVE_GLOW | CAVE_MARK);
-
-	i = y_height + 5;
-	j = xval + SCREEN_WID;
-	cave_set_feat(i, j, FEAT_SHOP);
-	cave[i][j].info |= (CAVE_GLOW | CAVE_MARK);
-	player_place(i + 1, j);
-}
-
-
-/*
- * Town logic flow for generation of arena -KMW-
- */
-static void arena_gen(void)
-{
-	int y, x;
-	int qy = SCREEN_HGT;
-	int qx = SCREEN_WID;
-	bool_ daytime;
-
-	/* Day time */
-	if ((turn % (10L * DAY)) < ((10L * DAY) / 2))
-		daytime = TRUE;
-
-	/* Night time */
-	else
-		daytime = FALSE;
-
-	/* Start with solid walls */
-	for (y = 0; y < MAX_HGT; y++)
-	{
-		for (x = 0; x < MAX_WID; x++)
-		{
-			/* Create "solid" perma-wall */
-			cave_set_feat(y, x, FEAT_PERM_SOLID);
-
-			/* Illuminate and memorize the walls */
-			cave[y][x].info |= (CAVE_GLOW | CAVE_MARK);
-		}
-	}
-
-	/* Then place some floors */
-	for (y = qy + 1; y < qy + SCREEN_HGT - 1; y++)
-	{
-		for (x = qx + 1; x < qx + SCREEN_WID - 1; x++)
-		{
-			/* Create empty floor */
-			cave_set_feat(y, x, FEAT_FLOOR);
-
-			/* Darken and forget the floors */
-			cave[y][x].info &= ~(CAVE_GLOW | CAVE_MARK);
-
-			/* Day time */
-			if (daytime)
-			{
-				/* Perma-Lite */
-				cave[y][x].info |= (CAVE_GLOW);
-
-				/* Memorize */
-				if (view_perma_grids) cave[y][x].info |= (CAVE_MARK);
-			}
-		}
-	}
-
-	build_arena();
-
-	place_monster_aux(p_ptr->py + 5, p_ptr->px, arena_monsters[p_ptr->arena_number],
-	                  FALSE, FALSE, MSTATUS_ENEMY);
-}
-
 
 /*
  * Creates a special level
@@ -8546,15 +8421,8 @@ void generate_cave(void)
 			/* No fated level here yet */
 			fate_flag = FALSE;
 
-			/* Build the arena -KMW- */
-			if (p_ptr->inside_arena)
-			{
-				/* Small arena */
-				arena_gen();
-			}
-
 			/* Quest levels -KMW- */
-			else if (p_ptr->inside_quest)
+			if (p_ptr->inside_quest)
 			{
 				process_hooks_new(HOOK_GEN_QUEST, NULL, NULL);
 			}
diff --git a/src/hiscore.h b/src/hiscore.h
index c74525a1..e4923165 100644
--- a/src/hiscore.h
+++ b/src/hiscore.h
@@ -46,10 +46,10 @@ struct high_score
 	char max_lev[4];                 /* Max Player Level (number) */
 	char max_dun[4];                 /* Max Dungeon Level (number) */
 
-	char arena_number[4];         /* Arena level attained -KMW- */
-	char inside_arena[4];    /* Did the player die in the arena? */
+	char unused_2[4]; /* Kept for compatibility only */
+	char unused_3[4]; /* Kept for compatibility only */
 	char inside_quest[4];    /* Did the player die in a quest? */
-	char exit_bldg[4];         /* Can the player exit arena? Goal obtained? -KMW- */
+	char unused_4[4]; /* Kept for compatibility only */
 
 	char how[32];                 /* Method of death (string) */
 };
diff --git a/src/loadsave.cc b/src/loadsave.cc
index c0a2522b..cb14f541 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -401,10 +401,10 @@ static bool_ do_extra(int flag)
 	do_s16b(&p_ptr->town_num, flag); 	/* -KMW- */
 
 	/* Write arena and rewards information -KMW- */
-	do_s16b(&p_ptr->arena_number, flag);
-	do_s16b(&p_ptr->inside_arena, flag);
+	do_s16b(&tmp16s, flag);
+	do_s16b(&tmp16s, flag);
 	do_s16b(&p_ptr->inside_quest, flag);
-	do_byte((byte*)&p_ptr->exit_bldg, flag);
+	do_byte(&tmp8u, flag);
 
 
 	/* Save/load spellbinder */
@@ -2940,11 +2940,7 @@ errr rd_savefile(void)
 static void junkinit(void)
 {
 	int i, j;
-	p_ptr->arena_number = 0;
-	p_ptr->inside_arena = 0;
 	p_ptr->inside_quest = 0;
-	p_ptr->exit_bldg = TRUE;
-	p_ptr->exit_bldg = TRUE;
 	p_ptr->town_num = 1;
 	p_ptr->wilderness_x = 4;
 	p_ptr->wilderness_y = 4;
diff --git a/src/spells1.cc b/src/spells1.cc
index c7b02580..c38da910 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -257,7 +257,7 @@ void teleport_away(int m_idx, int dis)
 			                (cave[ny][nx].feat <= FEAT_PATTERN_XTRA2)) continue;
 
 			/* No teleporting into vaults and such */
-			if (!(p_ptr->inside_quest || p_ptr->inside_arena))
+			if (!(p_ptr->inside_quest))
 				if (cave[ny][nx].info & (CAVE_ICKY)) continue;
 
 			/* This grid looks good */
@@ -824,7 +824,7 @@ void teleport_player_to(int ny, int nx)
 void teleport_player_level(void)
 {
 	/* No effect in arena or quest */
-	if (p_ptr->inside_arena || p_ptr->inside_quest)
+	if (p_ptr->inside_quest)
 	{
 		msg_print("There is no effect.");
 		return;
diff --git a/src/spells2.cc b/src/spells2.cc
index 33dcb75b..fe2e90a5 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -2823,9 +2823,9 @@ void stair_creation(void)
 	delete_object(p_ptr->py, p_ptr->px);
 
 	/* Create a staircase */
-	if (p_ptr->inside_arena || p_ptr->inside_quest)
+	if (p_ptr->inside_quest)
 	{
-		/* arena or quest */
+		/* quest */
 		msg_print("There is no effect!");
 	}
 	else if (!dun_level)
diff --git a/src/tables.cc b/src/tables.cc
index 8bf250e7..7e352504 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1115,15 +1115,6 @@ byte blows_table[12][12] =
 };
 
 
-s16b arena_monsters[MAX_ARENA_MONS] =
-{
-	30, 43, 102, 118, 126, 149, 173,
-	183, 188, 191, 216, 230, 238, 244,
-	255, 262, 293, 297, 321, 349, 372,
-	401, 415, 454, 464, 485, 538, 631,
-	641
-};
-
 
 /*
  * This table allows quick conversion from "speed" to "energy"
diff --git a/src/types.h b/src/types.h
index f87e760e..6154d51d 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1397,10 +1397,7 @@ struct player_type
 	s16b lev;			/* Level */
 
 	s16b town_num;			/* Current town number */
-	s16b arena_number;		/* monster number in arena -KMW- */
-	s16b inside_arena;		/* Is character inside arena? */
 	s16b inside_quest;		/* Inside quest level */
-	bool_ exit_bldg;			/* Goal obtained in arena? -KMW- */
 
 	s32b wilderness_x;              /* Coordinates in the wilderness */
 	s32b wilderness_y;
diff --git a/src/wizard2.cc b/src/wizard2.cc
index acfefd0c..84ffddad 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -67,7 +67,6 @@ finteletown:
 	p_ptr->wilderness_y = y;
 	p_ptr->wilderness_x = x;
 
-	p_ptr->inside_arena = 0;
 	leaving_quest = p_ptr->inside_quest;
 	p_ptr->inside_quest = 0;
 
@@ -1416,7 +1415,6 @@ static void do_cmd_wiz_jump(void)
 	/* Change level */
 	dun_level = command_arg;
 
-	p_ptr->inside_arena = 0;
 	leaving_quest = p_ptr->inside_quest;
 
 	p_ptr->inside_quest = 0;
diff --git a/src/xtra1.cc b/src/xtra1.cc
index fc319d73..1c4acfc8 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -501,10 +501,6 @@ static void prt_depth(int row, int col)
 	{
 		strcpy(depths, "             ");
 	}
-	else if (p_ptr->inside_arena)
-	{
-		strcpy(depths, "Arena");
-	}
 	else if (get_dungeon_name(depths))
 	{
 		/* Empty */
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 4109ffcb..43f48264 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -2519,14 +2519,6 @@ void monster_death(int m_idx)
 		}
 	}
 
-	/* Handle the possibility of player vanquishing arena combatant -KMW- */
-	if (p_ptr->inside_arena)
-	{
-		p_ptr->exit_bldg = TRUE;
-		msg_print("Victorious! You're on your way to becoming Champion.");
-		p_ptr->arena_number++;
-	}
-
 	/* If the doppleganger die, the variable must be set accordingly */
 	if (r_ptr->flags9 & RF9_DOPPLEGANGER) doppleganger = 0;