Remove unused fields in player_{class,race,race_mod} structs

5 files changed, 0 insertions, 143 deletions

diff --git a/src/init1.cc b/src/init1.cc
index 13a376d3..ed173481 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -1041,28 +1041,6 @@ errr init_player_info_txt(FILE *fp)
 			continue;
 		}
 
-		/* Process 'K' for "sKills" */
-		if ((buf[0] == 'R') && (buf[2] == 'K'))
-		{
-			int s[8];
-
-			/* Scan for the values */
-			if (8 != sscanf(buf + 4, "%d:%d:%d:%d:%d:%d:%d:%d",
-			                &s[0], &s[1], &s[2], &s[3], &s[4], &s[5], &s[6], &s[7])) return (1);
-
-			rp_ptr->r_dis = s[0];
-			rp_ptr->r_dev = s[1];
-			rp_ptr->r_sav = s[2];
-			rp_ptr->r_stl = s[3];
-			rp_ptr->r_srh = s[4];
-			rp_ptr->r_fos = s[5];
-			rp_ptr->r_thn = s[6];
-			rp_ptr->r_thb = s[7];
-
-			/* Next... */
-			continue;
-		}
-
 		/* Process 'k' for "skills" */
 		if ((buf[0] == 'R') && (buf[2] == 'k'))
 		{
@@ -1382,28 +1360,6 @@ errr init_player_info_txt(FILE *fp)
 			continue;
 		}
 
-		/* Process 'K' for "sKills" */
-		if ((buf[0] == 'S') && (buf[2] == 'K'))
-		{
-			int s[8];
-
-			/* Scan for the values */
-			if (8 != sscanf(buf + 4, "%d:%d:%d:%d:%d:%d:%d:%d",
-			                &s[0], &s[1], &s[2], &s[3], &s[4], &s[5], &s[6], &s[7])) return (1);
-
-			rmp_ptr->r_dis = s[0];
-			rmp_ptr->r_dev = s[1];
-			rmp_ptr->r_sav = s[2];
-			rmp_ptr->r_stl = s[3];
-			rmp_ptr->r_srh = s[4];
-			rmp_ptr->r_fos = s[5];
-			rmp_ptr->r_thn = s[6];
-			rmp_ptr->r_thb = s[7];
-
-			/* Next... */
-			continue;
-		}
-
 		/* Process 'P' for "xtra" */
 		if ((buf[0] == 'S') && (buf[2] == 'P'))
 		{
@@ -1764,50 +1720,6 @@ errr init_player_info_txt(FILE *fp)
 			continue;
 		}
 
-		/* Process 'K' for "sKills" */
-		if ((buf[0] == 'C') && (buf[2] == 'K'))
-		{
-			int s[8];
-
-			/* Scan for the values */
-			if (8 != sscanf(buf + 4, "%d:%d:%d:%d:%d:%d:%d:%d",
-			                &s[0], &s[1], &s[2], &s[3], &s[4], &s[5], &s[6], &s[7])) return (1);
-
-			c_ptr->c_dis = s[0];
-			c_ptr->c_dev = s[1];
-			c_ptr->c_sav = s[2];
-			c_ptr->c_stl = s[3];
-			c_ptr->c_srh = s[4];
-			c_ptr->c_fos = s[5];
-			c_ptr->c_thn = s[6];
-			c_ptr->c_thb = s[7];
-
-			/* Next... */
-			continue;
-		}
-
-		/* Process 'x' for "Xtra skills" */
-		if ((buf[0] == 'C') && (buf[2] == 'X'))
-		{
-			int s[8];
-
-			/* Scan for the values */
-			if (8 != sscanf(buf + 4, "%d:%d:%d:%d:%d:%d:%d:%d",
-			                &s[0], &s[1], &s[2], &s[3], &s[4], &s[5], &s[6], &s[7])) return (1);
-
-			c_ptr->x_dis = s[0];
-			c_ptr->x_dev = s[1];
-			c_ptr->x_sav = s[2];
-			c_ptr->x_stl = s[3];
-			c_ptr->x_srh = s[4];
-			c_ptr->x_fos = s[5];
-			c_ptr->x_thn = s[6];
-			c_ptr->x_thb = s[7];
-
-			/* Next... */
-			continue;
-		}
-
 		/* Process 'P' for "xtra" */
 		if ((buf[0] == 'C') && (buf[2] == 'P'))
 		{
diff --git a/src/loadsave.cc b/src/loadsave.cc
index d4cf63ff..2c5085ed 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -300,15 +300,6 @@ static void do_subrace(ls_flag_t flag)
 	do_byte((byte*)&sr_ptr->luck, flag);
 	do_s16b(&sr_ptr->mana, flag);
 
-	do_s16b(&sr_ptr->r_dis, flag);
-	do_s16b(&sr_ptr->r_dev, flag);
-	do_s16b(&sr_ptr->r_sav, flag);
-	do_s16b(&sr_ptr->r_stl, flag);
-	do_s16b(&sr_ptr->r_srh, flag);
-	do_s16b(&sr_ptr->r_fos, flag);
-	do_s16b(&sr_ptr->r_thn, flag);
-	do_s16b(&sr_ptr->r_thb, flag);
-
 	do_byte((byte*)&sr_ptr->r_mhp, flag);
 	do_s16b(&sr_ptr->r_exp, flag);
 
diff --git a/src/player_class.hpp b/src/player_class.hpp
index 236a3007..6e094717 100644
--- a/src/player_class.hpp
+++ b/src/player_class.hpp
@@ -23,39 +23,11 @@ struct player_class
 
 	s16b c_adj[6] { };	                             /* Class stat modifier */
 
-	s16b c_dis = 0;                                      /* class disarming */
-	s16b c_dev = 0;                                      /* class magic devices */
-	s16b c_sav = 0;                                      /* class saving throws */
-	s16b c_stl = 0;                                      /* class stealth */
-	s16b c_srh = 0;                                      /* class searching ability */
-	s16b c_fos = 0;                                      /* class searching frequency */
-	s16b c_thn = 0;                                      /* class to hit (normal) */
-	s16b c_thb = 0;                                      /* class to hit (bows) */
-
-	s16b x_dis = 0;                                      /* extra disarming */
-	s16b x_dev = 0;                                      /* extra magic devices */
-	s16b x_sav = 0;                                      /* extra saving throws */
-	s16b x_stl = 0;                                      /* extra stealth */
-	s16b x_srh = 0;                                      /* extra searching ability */
-	s16b x_fos = 0;                                      /* extra searching frequency */
-	s16b x_thn = 0;                                      /* extra to hit (normal) */
-	s16b x_thb = 0;                                      /* extra to hit (bows) */
-
 	s16b c_mhp = 0;                                      /* Class hit-dice adjustment */
 	s16b c_exp = 0;                                      /* Class experience factor */
 
 	s16b powers[4] { };                                  /* Powers of the class */
 
-	s16b spell_book = 0;                                 /* Tval of spell books (if any) */
-	s16b spell_stat = 0;                                 /* Stat for spells (if any)  */
-	s16b spell_lev = 0;                                  /* The higher it is the higher the spells level are */
-	s16b spell_fail = 0;                                 /* The higher it is the higher the spells failure are */
-	s16b spell_mana = 0;                                 /* The higher it is the higher the spells mana are */
-	s16b spell_first = 0;                                /* Level of first spell */
-	s16b spell_weight = 0;                               /* Weight that hurts spells */
-	byte max_spell_level = 0;                            /* Maximun spell level */
-	byte magic_max_spell = 0;                            /* Maximun numbner of spells one can learn by natural means */
-
 	player_race_flag_set flags;
 
 	s16b mana = 0;
diff --git a/src/player_race.hpp b/src/player_race.hpp
index 9af977aa..a80373bb 100644
--- a/src/player_race.hpp
+++ b/src/player_race.hpp
@@ -22,15 +22,6 @@ struct player_race
 
 	char luck = '\0';                                       /* Luck */
 
-	s16b r_dis = 0;                                         /* disarming */
-	s16b r_dev = 0;                                         /* magic devices */
-	s16b r_sav = 0;                                         /* saving throw */
-	s16b r_stl = 0;                                         /* stealth */
-	s16b r_srh = 0;                                         /* search ability */
-	s16b r_fos = 0;                                         /* search frequency */
-	s16b r_thn = 0;                                         /* combat (normal) */
-	s16b r_thb = 0;                                         /* combat (shooting) */
-
 	byte r_mhp = 0;                                         /* Race hit-dice modifier */
 	u16b r_exp = 0;                                         /* Race experience factor */
 
diff --git a/src/player_race_mod.hpp b/src/player_race_mod.hpp
index 756da347..9b0d95f6 100644
--- a/src/player_race_mod.hpp
+++ b/src/player_race_mod.hpp
@@ -22,15 +22,6 @@ struct player_race_mod
 	char luck = '\0';                                       /* Luck */
 	s16b mana = 0;                                          /* Mana % */
 
-	s16b r_dis = 0;                                         /* (+) disarming */
-	s16b r_dev = 0;                                         /* (+) magic devices */
-	s16b r_sav = 0;                                         /* (+) saving throw */
-	s16b r_stl = 0;                                         /* (+) stealth */
-	s16b r_srh = 0;                                         /* (+) search ability */
-	s16b r_fos = 0;                                         /* (+) search frequency */
-	s16b r_thn = 0;                                         /* (+) combat (normal) */
-	s16b r_thb = 0;                                         /* (+) combat (shooting) */
-
 	char r_mhp = 0;                                         /* (+) Race mod hit-dice modifier */
 	s16b r_exp = 0;                                         /* (+) Race mod experience factor */