diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-06-20 22:49:05 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-20 22:49:05 +0200 |
commit | 68e2a10b2d76cb3a2f5aa6818b4b184b6a02ef14 (patch) | |
tree | ec51a0b9156c6a28fa2764441ca66db36441604b /src/q_god.cc | |
parent | fc41a7d28d8896da79963d23ed1afba408e27470 (diff) |
Rework RF{1,2,3,7,8,9}_* monster flags to use flag_set<>
Diffstat (limited to 'src/q_god.cc')
-rw-r--r-- | src/q_god.cc | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/q_god.cc b/src/q_god.cc index d9bf955c..4634b46b 100644 --- a/src/q_god.cc +++ b/src/q_god.cc @@ -9,6 +9,7 @@ #include "hook_enter_dungeon_in.hpp" #include "hook_player_level_in.hpp" #include "hooks.hpp" +#include "monster_race_flag.hpp" #include "monster_spell_flag.hpp" #include "object2.hpp" #include "player_type.hpp" @@ -469,13 +470,13 @@ static void quest_god_set_god_dungeon_attributes_eru() d_info[DUNGEON_GOD].rules[0].percent = 50; /* M: We want evil or flying characters */ - d_info[DUNGEON_GOD].rules[0].mflags3 = RF3_EVIL; + d_info[DUNGEON_GOD].rules[0].mflags = RF_EVIL; d_info[DUNGEON_GOD].rules[1].mode = 3; d_info[DUNGEON_GOD].rules[1].percent = 50; /* M: We want evil or flying characters */ - d_info[DUNGEON_GOD].rules[1].mflags7 = RF7_CAN_FLY; + d_info[DUNGEON_GOD].rules[1].mflags = RF_CAN_FLY; } static void quest_god_set_god_dungeon_attributes_manwe() @@ -533,11 +534,11 @@ static void quest_god_set_god_dungeon_attributes_manwe() /* M: We want air(poison-type) or flying characters. Orcs * too. They would have ransacked his elf-loving temple :) */ - d_info[DUNGEON_GOD].rules[0].mflags2 = RF2_INVISIBLE; - d_info[DUNGEON_GOD].rules[1].mflags3 = RF3_ORC | RF3_IM_POIS; + d_info[DUNGEON_GOD].rules[0].mflags = RF_INVISIBLE; + d_info[DUNGEON_GOD].rules[1].mflags = RF_ORC | RF_IM_POIS; d_info[DUNGEON_GOD].rules[2].mspells = SF_BR_POIS | SF_BR_GRAV; d_info[DUNGEON_GOD].rules[3].mspells = SF_BA_POIS; - d_info[DUNGEON_GOD].rules[4].mflags7 = RF7_CAN_FLY; + d_info[DUNGEON_GOD].rules[4].mflags = RF_CAN_FLY; } static void quest_god_set_god_dungeon_attributes_tulkas() @@ -582,7 +583,7 @@ static void quest_god_set_god_dungeon_attributes_tulkas() d_info[DUNGEON_GOD].rules[0].percent = 100; /* M: plenty demons please */ - d_info[DUNGEON_GOD].rules[0].mflags3 = RF3_DEMON | RF3_EVIL; + d_info[DUNGEON_GOD].rules[0].mflags = RF_DEMON | RF_EVIL; } static void quest_god_set_god_dungeon_attributes_melkor() @@ -635,7 +636,7 @@ static void quest_god_set_god_dungeon_attributes_melkor() d_info[DUNGEON_GOD].rules[1].percent = 20; /* M: */ - d_info[DUNGEON_GOD].rules[1].mflags3 = RF3_GOOD; + d_info[DUNGEON_GOD].rules[1].mflags = RF_GOOD; } static void quest_god_set_god_dungeon_attributes_yavanna() @@ -685,8 +686,8 @@ static void quest_god_set_god_dungeon_attributes_yavanna() d_info[DUNGEON_GOD].rules[0].percent = 100; /* M: */ - d_info[DUNGEON_GOD].rules[0].mflags3 = - RF3_DEMON | RF3_UNDEAD | RF3_NONLIVING; + d_info[DUNGEON_GOD].rules[0].mflags = + RF_DEMON | RF_UNDEAD | RF_NONLIVING; } static void quest_god_set_god_dungeon_attributes_aule() @@ -783,11 +784,11 @@ static void quest_god_set_god_dungeon_attributes_varda() d_info[DUNGEON_GOD].rules[4].percent = 20; /* M: We want air(poison-type) or flying characters. Orcs too. */ - d_info[DUNGEON_GOD].rules[0].mflags2 = RF2_INVISIBLE; - d_info[DUNGEON_GOD].rules[1].mflags3 = RF3_ORC | RF3_IM_POIS; + d_info[DUNGEON_GOD].rules[0].mflags = RF_INVISIBLE; + d_info[DUNGEON_GOD].rules[1].mflags = RF_ORC | RF_IM_POIS; d_info[DUNGEON_GOD].rules[2].mspells = SF_BR_POIS | SF_BR_GRAV; d_info[DUNGEON_GOD].rules[3].mspells = SF_BA_POIS; - d_info[DUNGEON_GOD].rules[4].mflags7 = RF7_CAN_FLY; + d_info[DUNGEON_GOD].rules[4].mflags = RF_CAN_FLY; } static void quest_god_set_god_dungeon_attributes_ulmo() @@ -830,9 +831,9 @@ static void quest_god_set_god_dungeon_attributes_ulmo() d_info[DUNGEON_GOD].rules[2].percent = 30; /* M: Aquatic creatures only. */ - d_info[DUNGEON_GOD].rules[0].mflags3 = RF7_CAN_FLY; - d_info[DUNGEON_GOD].rules[1].mflags3 = RF7_AQUATIC; - d_info[DUNGEON_GOD].rules[2].mflags3 = RF3_RES_WATE; + d_info[DUNGEON_GOD].rules[0].mflags = RF_CAN_FLY; + d_info[DUNGEON_GOD].rules[1].mflags = RF_AQUATIC; + d_info[DUNGEON_GOD].rules[2].mflags = RF_RES_WATE; } static void quest_god_set_god_dungeon_attributes_mandos() @@ -876,7 +877,7 @@ static void quest_god_set_god_dungeon_attributes_mandos() d_info[DUNGEON_GOD].rules[0].r_char[2] = '\0'; d_info[DUNGEON_GOD].rules[0].r_char[3] = '\0'; d_info[DUNGEON_GOD].rules[0].r_char[4] = '\0'; - d_info[DUNGEON_GOD].rules[0].mflags3 = RF3_UNDEAD | RF3_EVIL; + d_info[DUNGEON_GOD].rules[0].mflags = RF_UNDEAD | RF_EVIL; } static bool_ quest_god_level_end_gen_hook(void *, void *, void *) |