X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fmonster-floor%2Fmonster-summon.cpp;h=ec17bf22cf1fd82b6815005e6cc7c3ffdff14fcf;hb=ca06a783f4715e692abeaecf5565101aa95624e6;hp=0475b94279493dc7c675dd7c80152853f9646a3b;hpb=95af651b1a3e900ec3428e65a0187799e353fb75;p=hengbandforosx%2Fhengbandosx.git diff --git a/src/monster-floor/monster-summon.cpp b/src/monster-floor/monster-summon.cpp index 0475b9427..ec17bf22c 100644 --- a/src/monster-floor/monster-summon.cpp +++ b/src/monster-floor/monster-summon.cpp @@ -1,4 +1,4 @@ -#include "monster-floor/monster-summon.h" +#include "monster-floor/monster-summon.h" #include "dungeon/dungeon-flag-types.h" #include "floor/geometry.h" #include "floor/wild.h" @@ -73,7 +73,7 @@ static bool summon_specific_okay(PlayerType *player_ptr, MonsterRaceId r_idx) return false; } - if ((r_ptr->flags7 & RF7_CHAMELEON) && floor.get_dungeon_definition().flags.has(DungeonFeatureType::CHAMELEON)) { + if (r_ptr->misc_flags.has(MonsterMiscType::CHAMELEON) && floor.get_dungeon_definition().flags.has(DungeonFeatureType::CHAMELEON)) { return true; } @@ -145,7 +145,7 @@ bool summon_specific(PlayerType *player_ptr, MONSTER_IDX who, POSITION y1, POSIT get_mon_num_prep(player_ptr, summon_specific_okay, get_monster_hook2(player_ptr, y, x)); DEPTH dlev = get_dungeon_or_wilderness_level(player_ptr); - MonsterRaceId r_idx = get_mon_num(player_ptr, 0, (dlev + lev) / 2 + 5, 0); + MonsterRaceId r_idx = get_mon_num(player_ptr, 0, (dlev + lev) / 2 + 5, mode); if (!MonsterRace(r_idx).is_valid()) { summon_specific_type = SUMMON_NONE; return false;