Integrate definition of wizard class to IS_WIZARD_CLASS().
if (p_ptr->pclass == CLASS_WARRIOR || p_ptr->pclass == CLASS_MONK || p_ptr->pclass == CLASS_SAMURAI || p_ptr->pclass == CLASS_BERSERKER)
strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-1)]);
- else if (p_ptr->pclass == CLASS_MAGE || p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER)
+ else if (IS_WIZARD_CLASS())
strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-1)+1]);
else strcpy(tmp,subtitle[randint0(MAX_SUBTITLE-2)+1]);
#define P_PTR_KI (p_ptr->magic_num1[0])
+#define IS_WIZARD_CLASS() \
+ (p_ptr->pclass == CLASS_MAGE || p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER || p_ptr->pclass == CLASS_MAGIC_EATER || p_ptr->pclass == CLASS_BLUE_MAGE)
+
/* Multishadow effects is determined by turn */
#define CHECK_MULTISHADOW() (p_ptr->multishadow && (turn & 1))
int rad = (plev < 30) ? 2 : 3;\r
int base;\r
\r
- if (p_ptr->pclass == CLASS_MAGE ||\r
- p_ptr->pclass == CLASS_HIGH_MAGE ||\r
- p_ptr->pclass == CLASS_SORCERER)\r
+ if (IS_WIZARD_CLASS())\r
base = plev + plev / 2;\r
else\r
base = plev + plev / 4;\r
int rad = (plev < 30) ? 2 : 3;\r
int base;\r
\r
- if (p_ptr->pclass == CLASS_MAGE ||\r
- p_ptr->pclass == CLASS_HIGH_MAGE ||\r
- p_ptr->pclass == CLASS_SORCERER)\r
+ if (IS_WIZARD_CLASS())\r
base = plev + plev / 2;\r
else\r
base = plev + plev / 4;\r
int rad = (plev < 30) ? 2 : 3;\r
int base;\r
\r
- if (p_ptr->pclass == CLASS_MAGE ||\r
- p_ptr->pclass == CLASS_HIGH_MAGE ||\r
- p_ptr->pclass == CLASS_SORCERER)\r
+ if (IS_WIZARD_CLASS())\r
base = plev + plev / 2;\r
else\r
base = plev + plev / 4;\r
/*** Determine Seriousness of Failure ***/
/* Mages recharge objects more safely. */
- if (p_ptr->pclass == CLASS_MAGE || p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER || p_ptr->pclass == CLASS_MAGIC_EATER || p_ptr->pclass == CLASS_BLUE_MAGE)
+ if (IS_WIZARD_CLASS() || p_ptr->pclass == CLASS_MAGIC_EATER || p_ptr->pclass == CLASS_BLUE_MAGE)
{
/* 10% chance to blow up one rod, otherwise draining. */
if (o_ptr->tval == TV_ROD)
/*** Determine Seriousness of Failure ***/
/* Mages recharge objects more safely. */
- if (p_ptr->pclass == CLASS_MAGE || p_ptr->pclass == CLASS_HIGH_MAGE || p_ptr->pclass == CLASS_SORCERER || p_ptr->pclass == CLASS_MAGIC_EATER || p_ptr->pclass == CLASS_BLUE_MAGE)
+ if (IS_WIZARD_CLASS())
{
/* 10% chance to blow up one rod, otherwise draining. */
if (o_ptr->tval == TV_ROD)