• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revisionbe40ca416e6505f25879a89db8ae589342d593e2 (tree)
Time2019-05-01 13:46:28
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 realm_choices1, realm_choices2 を player-class.c/h へ追加.

Change Summary

Incremental Difference

--- a/src/externs.h
+++ b/src/externs.h
@@ -75,8 +75,6 @@ extern const player_race race_info[MAX_RACES];
7575 extern const player_seikaku seikaku_info[MAX_SEIKAKU];
7676 extern const player_race mimic_info[];
7777 extern const u32b fake_spell_flags[4];
78-extern const s32b realm_choices1[];
79-extern const s32b realm_choices2[];
8078 extern const concptr realm_names[];
8179 #ifdef JP
8280 extern const concptr E_realm_names[];
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -5,6 +5,7 @@
55 #include "object-hook.h"
66 #include "monster.h"
77 #include "artifact.h"
8+#include "player-class.h"
89 #include "player-skill.h"
910 #include "quest.h"
1011 #include "world.h"
--- a/src/player-class.c
+++ b/src/player-class.c
@@ -354,3 +354,94 @@ const player_class class_info[MAX_CLASS] =
354354 2, 20, 40,
355355 },
356356 };
357+
358+/*!
359+ * 職業毎に選択可能な第一領域魔法テーブル
360+ */
361+const s32b realm_choices1[MAX_CLASS] =
362+{
363+ (CH_NONE), /* Warrior */
364+ (CH_LIFE | CH_SORCERY | CH_NATURE |
365+ CH_CHAOS | CH_DEATH | CH_TRUMP |
366+ CH_ARCANE | CH_ENCHANT | CH_DAEMON |
367+ CH_CRUSADE), /* Mage */
368+ (CH_LIFE | CH_DEATH | CH_DAEMON |
369+ CH_CRUSADE), /* Priest */
370+ (CH_SORCERY | CH_DEATH | CH_TRUMP |
371+ CH_ARCANE | CH_ENCHANT), /* Rogue */
372+ (CH_NATURE), /* Ranger */
373+ (CH_CRUSADE | CH_DEATH), /* Paladin */
374+ (CH_ARCANE), /* Warrior-Mage */
375+ (CH_CHAOS | CH_DAEMON), /* Chaos-Warrior */
376+ (CH_LIFE | CH_NATURE | CH_DEATH |
377+ CH_ENCHANT), /* Monk */
378+ (CH_NONE), /* Mindcrafter */
379+ (CH_LIFE | CH_SORCERY | CH_NATURE |
380+ CH_CHAOS | CH_DEATH | CH_TRUMP |
381+ CH_ARCANE | CH_ENCHANT | CH_DAEMON |
382+ CH_CRUSADE | CH_HEX), /* High-Mage */
383+ (CH_ARCANE), /* Tourist */
384+ (CH_NONE), /* Imitator */
385+ (CH_TRUMP), /* Beastmaster */
386+ (CH_NONE), /* Sorcerer */
387+ (CH_NONE), /* Archer */
388+ (CH_NONE), /* Magic eater */
389+ (CH_MUSIC), /* Bard */
390+ (CH_NONE), /* Red Mage */
391+ (CH_HISSATSU), /* Samurai */
392+ (CH_LIFE | CH_NATURE | CH_DEATH |
393+ CH_ENCHANT | CH_CRUSADE), /* ForceTrainer */
394+ (CH_NONE), /* Blue Mage */
395+ (CH_NONE), /* Cavalry */
396+ (CH_NONE), /* Berserker */
397+ (CH_NONE), /* Weaponsmith */
398+ (CH_NONE), /* Mirror-master */
399+ (CH_NONE), /* Ninja */
400+ (CH_NONE), /* Sniper */
401+};
402+
403+/*!
404+ * 職業毎に選択可能な第二領域魔法テーブル
405+ */
406+const s32b realm_choices2[MAX_CLASS] =
407+{
408+ (CH_NONE), /* Warrior */
409+ (CH_LIFE | CH_SORCERY | CH_NATURE |
410+ CH_CHAOS | CH_DEATH | CH_TRUMP |
411+ CH_ARCANE | CH_ENCHANT | CH_DAEMON |
412+ CH_CRUSADE), /* Mage */
413+ (CH_LIFE | CH_SORCERY | CH_NATURE |
414+ CH_CHAOS | CH_DEATH | CH_TRUMP |
415+ CH_ARCANE | CH_ENCHANT | CH_DAEMON |
416+ CH_CRUSADE), /* Priest */
417+ (CH_NONE), /* Rogue */
418+ (CH_SORCERY | CH_CHAOS | CH_DEATH |
419+ CH_TRUMP | CH_ARCANE | CH_DAEMON), /* Ranger */
420+ (CH_NONE), /* Paladin */
421+ (CH_LIFE | CH_NATURE | CH_CHAOS |
422+ CH_DEATH | CH_TRUMP | CH_ARCANE |
423+ CH_SORCERY | CH_ENCHANT | CH_DAEMON |
424+ CH_CRUSADE), /* Warrior-Mage */
425+ (CH_NONE), /* Chaos-Warrior */
426+ (CH_NONE), /* Monk */
427+ (CH_NONE), /* Mindcrafter */
428+ (CH_NONE), /* High-Mage */
429+ (CH_NONE), /* Tourist */
430+ (CH_NONE), /* Imitator */
431+ (CH_NONE), /* Beastmanster */
432+ (CH_NONE), /* Sorcerer */
433+ (CH_NONE), /* Archer */
434+ (CH_NONE), /* Magic eater */
435+ (CH_NONE), /* Bard */
436+ (CH_NONE), /* Red Mage */
437+ (CH_NONE), /* Samurai */
438+ (CH_NONE), /* ForceTrainer */
439+ (CH_NONE), /* Blue Mage */
440+ (CH_NONE), /* Cavalry */
441+ (CH_NONE), /* Berserker */
442+ (CH_NONE), /* Weaponsmith */
443+ (CH_NONE), /* Mirror-master */
444+ (CH_NONE), /* Ninja */
445+ (CH_NONE), /* Sniper */
446+};
447+
--- a/src/player-class.h
+++ b/src/player-class.h
@@ -65,4 +65,7 @@ struct player_class
6565 };
6666
6767 extern const player_class *cp_ptr;
68-extern const player_class class_info[MAX_CLASS];
\ No newline at end of file
68+extern const player_class class_info[MAX_CLASS];
69+
70+extern const s32b realm_choices1[];
71+extern const s32b realm_choices2[];
--- a/src/tables.c
+++ b/src/tables.c
@@ -2098,97 +2098,6 @@ const u32b fake_spell_flags[4]=
20982098 0xff000000
20992099 };
21002100
2101-/*!
2102- * 職業毎に選択可能な第一領域魔法テーブル
2103- */
2104-const s32b realm_choices1[MAX_CLASS] =
2105-{
2106- (CH_NONE), /* Warrior */
2107- (CH_LIFE | CH_SORCERY | CH_NATURE |
2108- CH_CHAOS | CH_DEATH | CH_TRUMP |
2109- CH_ARCANE | CH_ENCHANT | CH_DAEMON |
2110- CH_CRUSADE), /* Mage */
2111- (CH_LIFE | CH_DEATH | CH_DAEMON |
2112- CH_CRUSADE), /* Priest */
2113- (CH_SORCERY | CH_DEATH | CH_TRUMP |
2114- CH_ARCANE | CH_ENCHANT), /* Rogue */
2115- (CH_NATURE), /* Ranger */
2116- (CH_CRUSADE | CH_DEATH), /* Paladin */
2117- (CH_ARCANE), /* Warrior-Mage */
2118- (CH_CHAOS | CH_DAEMON), /* Chaos-Warrior */
2119- (CH_LIFE | CH_NATURE | CH_DEATH |
2120- CH_ENCHANT), /* Monk */
2121- (CH_NONE), /* Mindcrafter */
2122- (CH_LIFE | CH_SORCERY | CH_NATURE |
2123- CH_CHAOS | CH_DEATH | CH_TRUMP |
2124- CH_ARCANE | CH_ENCHANT | CH_DAEMON |
2125- CH_CRUSADE | CH_HEX), /* High-Mage */
2126- (CH_ARCANE), /* Tourist */
2127- (CH_NONE), /* Imitator */
2128- (CH_TRUMP), /* Beastmaster */
2129- (CH_NONE), /* Sorcerer */
2130- (CH_NONE), /* Archer */
2131- (CH_NONE), /* Magic eater */
2132- (CH_MUSIC), /* Bard */
2133- (CH_NONE), /* Red Mage */
2134- (CH_HISSATSU), /* Samurai */
2135- (CH_LIFE | CH_NATURE | CH_DEATH |
2136- CH_ENCHANT | CH_CRUSADE), /* ForceTrainer */
2137- (CH_NONE), /* Blue Mage */
2138- (CH_NONE), /* Cavalry */
2139- (CH_NONE), /* Berserker */
2140- (CH_NONE), /* Weaponsmith */
2141- (CH_NONE), /* Mirror-master */
2142- (CH_NONE), /* Ninja */
2143- (CH_NONE), /* Sniper */
2144-};
2145-
2146-/*!
2147- * 職業毎に選択可能な第二領域魔法テーブル
2148- */
2149-const s32b realm_choices2[MAX_CLASS] =
2150-{
2151- (CH_NONE), /* Warrior */
2152- (CH_LIFE | CH_SORCERY | CH_NATURE |
2153- CH_CHAOS | CH_DEATH | CH_TRUMP |
2154- CH_ARCANE | CH_ENCHANT | CH_DAEMON |
2155- CH_CRUSADE), /* Mage */
2156- (CH_LIFE | CH_SORCERY | CH_NATURE |
2157- CH_CHAOS | CH_DEATH | CH_TRUMP |
2158- CH_ARCANE | CH_ENCHANT | CH_DAEMON |
2159- CH_CRUSADE), /* Priest */
2160- (CH_NONE), /* Rogue */
2161- (CH_SORCERY | CH_CHAOS | CH_DEATH |
2162- CH_TRUMP | CH_ARCANE | CH_DAEMON), /* Ranger */
2163- (CH_NONE), /* Paladin */
2164- (CH_LIFE | CH_NATURE | CH_CHAOS |
2165- CH_DEATH | CH_TRUMP | CH_ARCANE |
2166- CH_SORCERY | CH_ENCHANT | CH_DAEMON |
2167- CH_CRUSADE), /* Warrior-Mage */
2168- (CH_NONE), /* Chaos-Warrior */
2169- (CH_NONE), /* Monk */
2170- (CH_NONE), /* Mindcrafter */
2171- (CH_NONE), /* High-Mage */
2172- (CH_NONE), /* Tourist */
2173- (CH_NONE), /* Imitator */
2174- (CH_NONE), /* Beastmanster */
2175- (CH_NONE), /* Sorcerer */
2176- (CH_NONE), /* Archer */
2177- (CH_NONE), /* Magic eater */
2178- (CH_NONE), /* Bard */
2179- (CH_NONE), /* Red Mage */
2180- (CH_NONE), /* Samurai */
2181- (CH_NONE), /* ForceTrainer */
2182- (CH_NONE), /* Blue Mage */
2183- (CH_NONE), /* Cavalry */
2184- (CH_NONE), /* Berserker */
2185- (CH_NONE), /* Weaponsmith */
2186- (CH_NONE), /* Mirror-master */
2187- (CH_NONE), /* Ninja */
2188- (CH_NONE), /* Sniper */
2189-};
2190-
2191-
21922101 #ifdef JP
21932102 /*!
21942103 * 領域魔法名称
Show on old repository browser