X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fplayer%2Fplayer-class.cpp;h=0232d4c16b386dc3f4901513a5bc508d458e2fe1;hb=b1f6d2236c6672534e12dc4e1ba40d3c451508e1;hp=063a956b493829800ec532184dab923d864985ef;hpb=a5c05a26c5bd5e4de9711e08b76e83ad91e9ad6b;p=hengbandforosx%2Fhengbandosx.git

diff --git a/src/player/player-class.cpp b/src/player/player-class.cpp
index 063a956b4..0232d4c16 100644
--- a/src/player/player-class.cpp
+++ b/src/player/player-class.cpp
@@ -14,8 +14,7 @@
  * The magic info
  */
 const player_magic *mp_ptr;
-player_magic *m_info;
-
+std::vector<player_magic> m_info;
 
 const player_class *cp_ptr;
 
@@ -389,6 +388,19 @@ const player_class class_info[MAX_CLASS] =
 		2, 20, 40,
 		4, 70, 2
 	},
+
+	{
+#ifdef JP
+		"元素使い",
+#endif
+		"Elementalist",
+
+		{-3, 1, 3, 0, -1, 0},
+		30, 40, 38, 3, 16, 20, 34, 20,
+		7,  15, 11, 0,  0,  0,  6,  7,
+		0, 30, 25,
+		3, 100, 2
+	},
 };
 
 /*!
@@ -798,6 +810,20 @@ const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 		"伯爵",
 		"領主",
 	},
+
+    /* Elementalist */
+    {
+        "練習生",
+        "奇術師",
+        "幻術師",
+        "呪術師",
+        "召霊師",
+        "召魔師",
+        "魔術師",
+        "魔道師",
+        "イプシシマス",
+        "大魔道師",
+    },
 };
 
 #else
@@ -1194,5 +1220,19 @@ const concptr player_title[MAX_CLASS][PY_MAX_LEVEL / 5] =
 		"Duke",
 		"Lord",
 	},
+
+    /* Elementalist */
+    {
+        "Apprentice",
+        "Trickster",
+        "Illusionist",
+        "Spellbinder",
+        "Evoker",
+        "Conjurer",
+        "Warlock",
+        "Sorcerer",
+        "Ipsissimus",
+        "Archmage",
+    },
 };
-#endif
\ No newline at end of file
+#endif