Remove dead BACT_* code and ba_info.txt entries

5 files changed, 0 insertions, 257 deletions

diff --git a/lib/edit/ba_info.txt b/lib/edit/ba_info.txt
index 6612185b..38444c13 100644
--- a/lib/edit/ba_info.txt
+++ b/lib/edit/ba_info.txt
@@ -65,10 +65,6 @@ N:10:Play craps
 C:0:0:0
 I:14:0:c
 
-N:11:Spin the wheel
-C:0:0:0
-I:15:0:s
-
 N:12:Play dice slots
 C:0:0:0
 I:16:0:d
@@ -97,14 +93,6 @@ N:18:Research monster
 C:1600:1500:1400
 I:20:0:r
 
-N:19:View bounties
-C:0:0:0
-I:38:0:v
-
-N:20:Receive bounty money
-C:0:0:0
-I:39:0:b
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
@@ -165,19 +153,6 @@ N:35:Get a quest
 C:0:0:0
 I:6:0:q
 
-# Restrict to liked/normal
-N:36:Get a quest
-C:0:0:0
-I:46:1:q
-
-N:37:Get a quest
-C:0:0:0
-I:47:0:q
-
-N:38:Get a quest
-C:0:0:0
-I:49:0:q
-
 N:39:Herbal Healing
 C:32000:10000:0
 I:50:0:h
@@ -190,10 +165,6 @@ N:41:Distribute earnings
 C:0:0:0
 I:7:2:d
 
-N:42:Morph restoration
-C:3000:1500:750
-I:37:0:r
-
 #for The Mirror
 N:43:View fate
 C:500:500:500
@@ -204,11 +175,6 @@ N:44:Research item
 C:1500:1500:1500
 I:1:0:a
 
-#for library in gondol
-N:45:Research item
-C:2000:2000:2000
-I:1:0:a
-
 #for Star-Dome
 N:46:Identify possessions
 C:1200:1000:250
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt
index 825bf9a2..4cda4421 100644
--- a/lib/edit/st_info.txt
+++ b/lib/edit/st_info.txt
@@ -340,9 +340,6 @@ G:+:s
 W:0
 
 N:16:Beastmaster Shanty
-# Disabled the bounty list for the time being to not confuse people
-# with the bounty quest
-# A:18:0:19:20:21:22
 A:18:0:21:22:0:0
 O:19:19:19:19
 G:+:g
diff --git a/lib/mods/theme/edit/ba_info.txt b/lib/mods/theme/edit/ba_info.txt
index 1a695f75..96d372bf 100644
--- a/lib/mods/theme/edit/ba_info.txt
+++ b/lib/mods/theme/edit/ba_info.txt
@@ -65,10 +65,6 @@ N:10:Play craps
 C:0:0:0
 I:14:0:c
 
-N:11:Spin the wheel
-C:0:0:0
-I:15:0:s
-
 N:12:Play dice slots
 C:0:0:0
 I:16:0:d
@@ -97,14 +93,6 @@ N:18:Research monster
 C:1600:1500:1400
 I:20:0:r
 
-N:19:View bounties
-C:0:0:0
-I:38:0:v
-
-N:20:Receive bounty money
-C:0:0:0
-I:39:0:b
-
 N:21:Get quest monster
 C:0:0:0
 I:54:0:q
@@ -165,19 +153,6 @@ N:35:Get a quest
 C:0:0:0
 I:6:0:q
 
-# Restrict to liked/normal
-N:36:Get a quest
-C:0:0:0
-I:46:1:q
-
-N:37:Get a quest
-C:0:0:0
-I:47:0:q
-
-N:38:Get a quest
-C:0:0:0
-I:49:0:q
-
 N:39:Herbal Healing
 C:32000:10000:0
 I:50:0:h
@@ -190,10 +165,6 @@ N:41:Distribute earnings
 C:0:0:0
 I:7:2:d
 
-N:42:Morph restoration
-C:3000:1500:750
-I:37:0:r
-
 #for The Mirror
 N:43:View fate
 C:500:500:500
@@ -204,11 +175,6 @@ N:44:Research item
 C:1500:1500:1500
 I:1:0:a
 
-#for library in gondol
-N:45:Research item
-C:2000:2000:2000
-I:1:0:a
-
 #for Star-Dome
 N:46:Identify possessions
 C:1200:1000:250
diff --git a/src/bldg.cc b/src/bldg.cc
index d3910bbf..a0724c33 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -426,40 +426,6 @@ static bool_ gamble_comm(int cmd)
 					break;
 				}
 
-			case BACT_SPIN_WHEEL:   /* Spin the Wheel Game */
-				{
-					win = FALSE;
-					odds = 10;
-					c_put_str(TERM_GREEN, "Wheel", 5, 2);
-					prt("0  1  2  3  4  5  6  7  8  9", 7, 5);
-					prt("--------------------------------", 8, 3);
-					strcpy(out_val, "");
-					get_string ("Pick a number (1-9): ", out_val, 32);
-					for (p = out_val; *p == ' '; p++);
-					choice = atol(p);
-					if (choice < 0)
-					{
-						msg_print("I'll put you down for 0.");
-						choice = 0;
-					}
-					else if (choice > 9)
-					{
-						msg_print("Ok, I'll put you down for 9.");
-						choice = 9;
-					}
-					msg_print(NULL);
-					roll1 = randint(10) - 1;
-					strnfmt(tmp_str, 80, "The wheel spins to a stop and the winner is %d",
-					        roll1);
-					prt(tmp_str, 13, 3);
-					prt("", 9, 0);
-					prt("*", 9, (3 * roll1 + 5));
-					if (roll1 == choice)
-						win = TRUE;
-
-					break;
-				}
-
 			case BACT_DICE_SLOTS:  /* The Dice Slots */
 				{
 					c_put_str(TERM_GREEN, "Dice Slots", 5, 2);
@@ -1130,61 +1096,6 @@ static void show_quest_monster(void)
 }
 
 
-/*
- * Show the current bounties.
- */
-static void show_bounties(void)
-{
-	int i, j = 6;
-
-	monster_race* r_ptr;
-
-	char buff[80];
-
-
-	clear_bldg(7, 18);
-
-	c_prt(TERM_YELLOW, "Currently active bounties:", 4, 2);
-
-	for (i = 1; i < MAX_BOUNTIES; i++, j++)
-	{
-		r_ptr = &r_info[bounties[i][0]];
-
-		strnfmt(buff, 80, "%-30s (%d gp)", r_ptr->name, bounties[i][1]);
-
-		prt(buff, j, 2);
-
-		if (j >= 17)
-		{
-			msg_print("Press space for more.");
-			msg_print(NULL);
-
-			clear_bldg(7, 18);
-			j = 5;
-		}
-	}
-}
-
-
-/*
- * Filter for corpses that currently have a bounty on them.
- */
-static bool_ item_tester_hook_bounty(object_type* o_ptr)
-{
-	int i;
-
-
-	if (o_ptr->tval == TV_CORPSE)
-	{
-		for (i = 1; i < MAX_BOUNTIES; i++)
-		{
-			if (bounties[i][0] == o_ptr->pval2) return (TRUE);
-		}
-	}
-
-	return (FALSE);
-}
-
 /* Filter to match the quest monster's corpse. */
 static bool_ item_tester_hook_quest_monster(object_type* o_ptr)
 {
@@ -1195,80 +1106,6 @@ static bool_ item_tester_hook_quest_monster(object_type* o_ptr)
 
 
 /*
- * Return the boost in the corpse's value depending on how rare the body
- * part is.
- */
-static int corpse_value_boost(int sval)
-{
-	switch (sval)
-	{
-	case SV_CORPSE_HEAD:
-	case SV_CORPSE_SKULL:
-		{
-			return (1);
-		}
-
-		/* Default to no boost. */
-	default:
-		{
-			return (0);
-		}
-	}
-}
-
-/*
- * Sell a corpse, if there's currently a bounty on it.
- */
-static void sell_corpses(void)
-{
-	object_type* o_ptr;
-
-	int i, boost = 0;
-
-	s16b value;
-
-	int item;
-
-
-	/* Set the hook. */
-	item_tester_hook = item_tester_hook_bounty;
-
-	/* Select a corpse to sell. */
-	if (!get_item(&item, "Sell which corpse",
-	                "You have no corpses you can sell.", USE_INVEN)) return;
-
-	o_ptr = &p_ptr->inventory[item];
-
-	/* Exotic body parts are worth more. */
-	boost = corpse_value_boost(o_ptr->sval);
-
-	/* Try to find a match. */
-	for (i = 1; i < MAX_BOUNTIES; i++)
-	{
-		if (o_ptr->pval2 == bounties[i][0])
-		{
-			value = bounties[i][1] + boost * (r_info[o_ptr->pval2].level);
-
-			msg_format("Sold for %ld gold pieces.", value);
-			msg_print(NULL);
-			p_ptr->au += value;
-
-			/* Increase the number of collected bounties */
-			total_bounties++;
-
-			inc_stack_size(item, -1);
-
-			return;
-		}
-	}
-
-	msg_print("Sorry, but that monster does not have a bounty on it.");
-	msg_print(NULL);
-}
-
-
-
-/*
  * Hook for bounty monster selection.
  */
 static bool_ mon_hook_bounty(int r_idx)
@@ -1560,8 +1397,6 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 		}
 
 	case BACT_QUEST1:
-	case BACT_QUEST2:
-	case BACT_QUEST4:
 		{
 			int y = 1, x = 1;
 			bool_ ok = FALSE;
@@ -1602,7 +1437,6 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 
 	case BACT_IN_BETWEEN:
 	case BACT_CRAPS:
-	case BACT_SPIN_WHEEL:
 	case BACT_DICE_SLOTS:
 	case BACT_GAMBLE_RULES:
 		{
@@ -1744,12 +1578,6 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 			break;
 		}
 
-	case BACT_VIEW_BOUNTIES:
-		{
-			show_bounties();
-			break;
-		}
-
 	case BACT_VIEW_QUEST_MON:
 		{
 			show_quest_monster();
@@ -1762,12 +1590,6 @@ bool_ bldg_process_command(store_type *s_ptr, int i)
 			break;
 		}
 
-	case BACT_SELL_CORPSES:
-		{
-			sell_corpses();
-			break;
-		}
-
 	case BACT_DIVINATION:
 		{
 			int i, count = 0;
diff --git a/src/defines.h b/src/defines.h
index 6267ae47..05fb49f3 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -685,9 +685,6 @@
 
 /* Permanent walls for quests */
 #define FEAT_QUEST1             0x4B
-#define FEAT_QUEST2             0x4C
-#define FEAT_QUEST3             0x4D
-#define FEAT_QUEST4             0x4E
 
 /* Features 0x4F - 0x53 -- unused */
 
@@ -3859,7 +3856,6 @@
 #define BACT_IN_BETWEEN             12
 #define BACT_GAMBLE_RULES           13
 #define BACT_CRAPS                  14
-#define BACT_SPIN_WHEEL             15
 #define BACT_DICE_SLOTS             16
 #define BACT_REST                   17
 #define BACT_FOOD                   18
@@ -3877,8 +3873,6 @@
 #define BACT_RECALL                 33
 #define BACT_TELEPORT_LEVEL         34
 #define BACT_MIMIC_NORMAL           37
-#define BACT_VIEW_BOUNTIES          38
-#define BACT_SELL_CORPSES           39
 #define BACT_VIEW_QUEST_MON         40
 #define BACT_SELL_QUEST_MON         41
 #define BACT_DIVINATION             42
@@ -3886,8 +3880,6 @@
 #define BACT_BUY                    44
 #define BACT_EXAMINE                45
 #define BACT_STEAL                  46
-#define BACT_QUEST2                 47
-#define BACT_QUEST4                 49
 #define BACT_STAR_HEAL              50
 #define BACT_DROP_ITEM              54
 #define BACT_GET_ITEM               55