Remove unused sr_ptr monster_type field

5 files changed, 1 insertions, 84 deletions

diff --git a/src/defines.h b/src/defines.h
index d8a5d4f2..2c2d388d 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -4180,7 +4180,7 @@
 
 #define MEGO_CHANCE             18      /* % chances of getting ego monsters */
 
-#define race_inf(m_ptr) (((m_ptr)->sr_ptr) ? (m_ptr)->sr_ptr : race_info_idx((m_ptr)->r_idx, (m_ptr)->ego))
+#define race_inf(m_ptr) (race_info_idx((m_ptr)->r_idx, (m_ptr)->ego))
 
 /* Object generation */
 #define OBJ_GENE_TREASURE       20
diff --git a/src/loadsave.c b/src/loadsave.c
index 85c05260..f68d974c 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -1509,7 +1509,6 @@ static void do_item(object_type *o_ptr, int flag)
 static void do_monster(monster_type *m_ptr, int flag)
 {
 	int i;
-	bool_ tmp;
 
 	/* Read the monster race */
 	do_s16b(&m_ptr->r_idx, flag);
@@ -1553,69 +1552,6 @@ static void do_monster(monster_type *m_ptr, int flag)
 		do_byte(&m_ptr->blow[i].d_dice, flag);
 		do_byte(&m_ptr->blow[i].d_side, flag);
 	}
-
-	/* Special race */
-	tmp = (m_ptr->sr_ptr) ? TRUE : FALSE;
-	do_byte((byte*)&tmp, flag);
-	if (tmp)
-	{
-		if (flag == LS_LOAD)
-		{
-			MAKE(m_ptr->sr_ptr, monster_race);
-		}
-		do_u32b(&m_ptr->sr_ptr->name, flag);
-		do_u32b(&m_ptr->sr_ptr->text, flag);
-
-		do_u16b(&m_ptr->sr_ptr->hdice, flag);
-		do_u16b(&m_ptr->sr_ptr->hside, flag);
-
-		do_s16b(&m_ptr->sr_ptr->ac, flag);
-
-		do_s16b(&m_ptr->sr_ptr->sleep, flag);
-		do_byte(&m_ptr->sr_ptr->aaf, flag);
-		do_byte(&m_ptr->sr_ptr->speed, flag);
-
-		do_s32b(&m_ptr->sr_ptr->mexp, flag);
-
-		do_s32b(&m_ptr->sr_ptr->weight, flag);
-
-		do_byte(&m_ptr->sr_ptr->freq_inate, flag);
-		do_byte(&m_ptr->sr_ptr->freq_spell, flag);
-
-		do_u32b(&m_ptr->sr_ptr->flags1, flag);
-		do_u32b(&m_ptr->sr_ptr->flags2, flag);
-		do_u32b(&m_ptr->sr_ptr->flags3, flag);
-		do_u32b(&m_ptr->sr_ptr->flags4, flag);
-		do_u32b(&m_ptr->sr_ptr->flags5, flag);
-		do_u32b(&m_ptr->sr_ptr->flags6, flag);
-		do_u32b(&m_ptr->sr_ptr->flags7, flag);
-		do_u32b(&m_ptr->sr_ptr->flags8, flag);
-		do_u32b(&m_ptr->sr_ptr->flags9, flag);
-
-		/* Attacks */
-		for (i = 0; i < 4; i++)
-		{
-			do_byte(&m_ptr->sr_ptr->blow[i].method, flag);
-			do_byte(&m_ptr->sr_ptr->blow[i].effect, flag);
-			do_byte(&m_ptr->sr_ptr->blow[i].d_dice, flag);
-			do_byte(&m_ptr->sr_ptr->blow[i].d_side, flag);
-		}
-
-		for (i = 0; i < BODY_MAX; i++)
-			do_byte(&m_ptr->sr_ptr->body_parts[i], flag);
-
-		do_byte(&m_ptr->sr_ptr->level, flag);
-		do_byte(&m_ptr->sr_ptr->rarity, flag);
-
-		do_byte((byte*)&m_ptr->sr_ptr->d_char, flag);
-		do_byte(&m_ptr->sr_ptr->d_attr, flag);
-
-		do_byte((byte*)&m_ptr->sr_ptr->x_char, flag);
-		do_byte(&m_ptr->sr_ptr->x_attr, flag);
-
-		do_s16b(&m_ptr->sr_ptr->max_num, flag);
-		do_byte(&m_ptr->sr_ptr->cur_num, flag);
-	}
 }
 
 
diff --git a/src/monster2.c b/src/monster2.c
index 845434b1..d09f5cf6 100644
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -492,10 +492,6 @@ void delete_monster_idx(int i)
 		delete_object_idx(this_o_idx);
 	}
 
-	/* Delete mind & special race if needed */
-	if (m_ptr->sr_ptr)
-		KILL(m_ptr->sr_ptr, monster_race);
-
 	/* Wipe the Monster */
 	m_ptr = WIPE(m_ptr, monster_type);
 
@@ -614,10 +610,6 @@ static void compact_monsters_aux(int i1, int i2)
 	/* Structure copy */
 	COPY(&m_list[i2], &m_list[i1], monster_type);
 
-	/* Delete mind & special race if needed */
-	if (m_list[i1].sr_ptr)
-		KILL(m_list[i1].sr_ptr, monster_race);
-
 	/* Wipe the hole */
 	m_ptr = WIPE(&m_list[i1], monster_type);
 }
@@ -736,11 +728,6 @@ void wipe_m_list(void)
 		/* Monster is gone */
 		cave[m_ptr->fy][m_ptr->fx].m_idx = 0;
 
-		/* Delete mind & special race if needed */
-		if (m_ptr->sr_ptr)
-			KILL(m_ptr->sr_ptr, monster_race);
-
-
 		/* Wipe the Monster */
 		m_ptr = WIPE(m_ptr, monster_type);
 	}
@@ -2316,9 +2303,6 @@ s16b place_monster_one(int y, int x, int r_idx, int ego, bool_ slp, int status)
 	m_ptr->r_idx = r_idx;
 	m_ptr->ego = ego;
 
-	/* No special, no mind */
-	m_ptr->sr_ptr = NULL;
-
 	/* Place the monster at the location */
 	m_ptr->fy = y;
 	m_ptr->fx = x;
diff --git a/src/object1.c b/src/object1.c
index a5dbc3d5..35dfbd5c 100644
--- a/src/object1.c
+++ b/src/object1.c
@@ -1615,7 +1615,6 @@ void object_desc(char *buf, object_type *o_ptr, int pref, int mode)
 			char name[80];
 			monster_type monster;
 
-			monster.sr_ptr = 0;
 			monster.r_idx = o_ptr->pval;
 			monster.ego = o_ptr->pval2;
 			monster.ml = TRUE;
diff --git a/src/types.h b/src/types.h
index 2339a9ce..7cd9a8a1 100644
--- a/src/types.h
+++ b/src/types.h
@@ -892,8 +892,6 @@ struct monster_type
 	s16b target;                    /* Monster target */
 
 	s16b possessor;                 /* Is it under the control of a possessor ? */
-
-	monster_race *sr_ptr;           /* Does it have a specific race(not in r_info) */
 };