diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-03-22 13:05:39 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-03-22 13:05:39 +0100 |
| commit | b11197ae79d621c50d89f6a092a3f95f954712f0 (patch) | |
| tree | 44b20f31bc6b4f946d2f4fb6c19afdce558a34f2 /src/files.cc | |
| parent | fb2a78c52a32026a57fd9cc7763a783456199dd7 (diff) | |
Inline various GOD macros
Diffstat (limited to 'src/files.cc')
| -rw-r--r-- | src/files.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/files.cc b/src/files.cc index 9585a249..78784938 100644 --- a/src/files.cc +++ b/src/files.cc @@ -1589,28 +1589,28 @@ void player_flags(u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp) if (get_skill(SKILL_WATER) >= 30) (*f5) |= TR5_WATER_BREATH; /* Gods */ - GOD(GOD_ERU) + if (p_ptr->pgod == GOD_ERU) { if ((p_ptr->grace >= 100) || (p_ptr->grace <= -100)) (*f1) |= TR1_MANA; if (p_ptr->grace > 10000) (*f1) |= TR1_WIS; } - GOD(GOD_MELKOR) + if (p_ptr->pgod == GOD_MELKOR) { (*f2) |= TR2_RES_FIRE; if (p_ptr->melkor_sacrifice > 0) (*f2) |= TR2_LIFE; if (p_ptr->grace > 10000) (*f1) |= (TR1_STR | TR1_CON | TR1_INT | TR1_WIS | TR1_CHR); - PRAY_GOD(GOD_MELKOR) + if (p_ptr->praying) { if (p_ptr->grace > 5000) (*f2) |= TR2_INVIS; if (p_ptr->grace > 15000) (*f2) |= TR2_IM_FIRE; } } - GOD(GOD_MANWE) + if (p_ptr->pgod == GOD_MANWE) { if (p_ptr->grace >= 2000) (*f3) |= TR3_FEATHER; - PRAY_GOD(GOD_MANWE) + if (p_ptr->praying) { if (p_ptr->grace >= 7000) (*f2) |= TR2_FREE_ACT; if (p_ptr->grace >= 15000) (*f4) |= TR4_FLY; @@ -1618,13 +1618,13 @@ void player_flags(u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp) } } - GOD(GOD_TULKAS) + if (p_ptr->pgod == GOD_TULKAS) { if (p_ptr->grace > 5000) (*f1) |= TR1_CON; if (p_ptr->grace > 10000) (*f1) |= TR1_STR; } - GOD(GOD_AULE) + if (p_ptr->pgod == GOD_AULE) { if (p_ptr->grace > 5000) { @@ -1632,7 +1632,7 @@ void player_flags(u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp) } } - GOD(GOD_MANDOS) + if (p_ptr->pgod == GOD_MANDOS) { (*f2) |= TR2_RES_NETHER; @@ -1649,7 +1649,7 @@ void player_flags(u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b *f5, u32b *esp) } } - GOD(GOD_ULMO) + if (p_ptr->pgod == GOD_ULMO) { (*f5) |= TR5_WATER_BREATH; |