diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 16:29:22 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-31 16:29:22 -0500 |
| commit | 5b0503840d4c37935ebd18004e4507e15fba1e0a (patch) | |
| tree | 9c0db8cdd26ffbbf1025e331f99cd8c6b00d6022 /crawl-ref/source/xom.cc | |
| parent | 36c1e052d3abd19d754f70d03f5fab70ba2422a5 (diff) | |
| download | crawl-ref-5b0503840d4c37935ebd18004e4507e15fba1e0a.tar.gz crawl-ref-5b0503840d4c37935ebd18004e4507e15fba1e0a.zip | |
Add more minor cosmetic fixes.
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index c73d266c37..34e879f41e 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1257,11 +1257,11 @@ static int _xom_send_allies(int sever, bool debug = false) for (int i = 0; i < numdemons; ++i) { - monster_type monster = _xom_random_demon(sever); + monster_type mon_type = _xom_random_demon(sever); summons[i] = create_monster( - mgen_data(monster, BEH_FRIENDLY, + mgen_data(mon_type, BEH_FRIENDLY, 3, MON_SUMM_AID, you.pos(), MHITYOU, MG_FORCE_BEH, GOD_XOM)); @@ -1269,7 +1269,7 @@ static int _xom_send_allies(int sever, bool debug = false) if (summons[i] != -1) { num_actually_summoned++; - is_demonic[i] = (mons_class_holiness(monster) == MH_DEMONIC); + is_demonic[i] = (mons_class_holiness(mon_type) == MH_DEMONIC); // If it's not a demon, Xom got it someplace else, so use // different messages below. @@ -1351,8 +1351,8 @@ static int _xom_send_one_ally(int sever, bool debug = false) if (debug) return (XOM_GOOD_SINGLE_ALLY); - const monster_type mon = _xom_random_demon(sever); - const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC); + const monster_type mon_type = _xom_random_demon(sever); + const bool is_demonic = (mons_class_holiness(mon_type) == MH_DEMONIC); // If we have a non-demon, Xom got it someplace else, so use // different messages below. @@ -1366,7 +1366,7 @@ static int _xom_send_one_ally(int sever, bool debug = false) const int summons = create_monster( - mgen_data(mon, beha, 6, MON_SUMM_AID, you.pos(), MHITYOU, + mgen_data(mon_type, beha, 6, MON_SUMM_AID, you.pos(), MHITYOU, MG_FORCE_BEH, GOD_XOM)); if (summons != -1) @@ -1866,8 +1866,8 @@ static int _xom_send_major_ally(int sever, bool debug = false) if (debug) return (XOM_GOOD_MAJOR_ALLY); - const monster_type mon = _xom_random_demon(sever); - const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC); + const monster_type mon_type = _xom_random_demon(sever); + const bool is_demonic = (mons_class_holiness(mon_type) == MH_DEMONIC); beh_type beha = BEH_FRIENDLY; |