From 4b179786d73cde338e97503d036baea9015f655d Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Wed, 5 Oct 2016 18:45:08 +0200
Subject: Move gen_skill to GameEditData

---
 src/game_edit_data.hpp | 5 +++++
 src/init1.cc           | 3 ++-
 src/init2.cc           | 2 +-
 src/skills.cc          | 5 ++++-
 src/variable.cc        | 5 -----
 src/variable.hpp       | 1 -
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/game_edit_data.hpp b/src/game_edit_data.hpp
index 9370b7d4..bfb2e418 100644
--- a/src/game_edit_data.hpp
+++ b/src/game_edit_data.hpp
@@ -64,4 +64,9 @@ struct GameEditData {
 	 */
 	std::vector<hist_type> bg;
 
+	/**
+	 * Base skills for all characters.
+	 */
+	skill_modifiers gen_skill;
+
 };
diff --git a/src/init1.cc b/src/init1.cc
index f6d798a9..afd256a4 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -923,6 +923,7 @@ errr init_player_info_txt(FILE *fp)
 	auto &race_info = game->edit_data.race_info;
 	auto &race_mod_info = game->edit_data.race_mod_info;
 	auto &bg = game->edit_data.bg;
+	auto &gen_skill = game->edit_data.gen_skill;
 
 	int lev = 1;
 	int tit_idx = 0;
@@ -986,7 +987,7 @@ errr init_player_info_txt(FILE *fp)
 		/* Process 'G:k' for "General skills" */
 		if ((buf[0] == 'G') && (buf[2] == 'k'))
 		{
-			if (read_skill_modifiers(gen_skill, buf + 4))
+			if (read_skill_modifiers(&gen_skill, buf + 4))
 			{
 				return 1;
 			}
diff --git a/src/init2.cc b/src/init2.cc
index be69192f..f48cc44c 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -550,7 +550,7 @@ namespace {
 
 		static void allocate()
 		{
-			gen_skill = new skill_modifiers;
+			// Nothing to do
 		}
 
 		static errr parse(FILE *fp)
diff --git a/src/skills.cc b/src/skills.cc
index b97e80a8..a1f9f793 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -14,6 +14,7 @@
 #include "cmd3.hpp"
 #include "cmd5.hpp"
 #include "cmd7.hpp"
+#include "game.hpp"
 #include "gods.hpp"
 #include "help.hpp"
 #include "hooks.hpp"
@@ -1198,7 +1199,9 @@ static void augment_skills(s32b *v, s32b *m, skill_modifier const &s)
  */
 void compute_skills(s32b *v, s32b *m, int i)
 {
-	augment_skills(v, m, gen_skill->modifiers[i]);
+	auto const &gen_skill = game->edit_data.gen_skill;
+
+	augment_skills(v, m, gen_skill.modifiers[i]);
 	augment_skills(v, m, rp_ptr->skill_modifiers.modifiers[i]);
 	augment_skills(v, m, rmp_ptr->skill_modifiers.modifiers[i]);
 	augment_skills(v, m, cp_ptr->skill_modifiers.modifiers[i]);
diff --git a/src/variable.cc b/src/variable.cc
index 272d9267..b1a8c674 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -786,11 +786,6 @@ int project_time = 0;
 s32b project_time_effect = 0;
 effect_type effects[MAX_EFFECTS];
 
-/*
- * General skills set
- */
-skill_modifiers *gen_skill;
-
 /*
  * Table of "cli" macros.
  */
diff --git a/src/variable.hpp b/src/variable.hpp
index 9b1e4816..4f00f1da 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -229,7 +229,6 @@ extern school_type schools[SCHOOLS_MAX];
 extern int project_time;
 extern s32b project_time_effect;
 extern effect_type effects[MAX_EFFECTS];
-extern skill_modifiers *gen_skill;
 extern bool_ automatizer_enabled;
 extern s16b last_teleportation_y;
 extern s16b last_teleportation_x;
-- 
cgit v1.2.3