diff options
author | Stefan O'Rear <stefanor@cox.net> | 2009-11-12 03:52:08 -0800 |
---|---|---|
committer | Stefan O'Rear <stefanor@cox.net> | 2009-11-12 03:53:13 -0800 |
commit | 078019644214628520c8116a9b4a16f30d8fadf2 (patch) | |
tree | df1fc93d35c6b39455445360e482be5c26e1e2ac /crawl-ref/source/it_use3.cc | |
parent | 7f502e207784d2c33ab38079dadfa298ab9fafc6 (diff) | |
download | crawl-ref-078019644214628520c8116a9b4a16f30d8fadf2.tar.gz crawl-ref-078019644214628520c8116a9b4a16f30d8fadf2.zip |
Add summoner and non_actor_summoner to mgen_data
Monsters now know who summoned them. This will be important later.
Probably breaks something; saves are not one of them.
Diffstat (limited to 'crawl-ref/source/it_use3.cc')
-rw-r--r-- | crawl-ref/source/it_use3.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 8e40030f83..d1bfd030c6 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -145,8 +145,8 @@ void shadow_lantern_effect() { if (x_chance_in_y(player_spec_death() + 1, 8)) { - create_monster(mgen_data(MONS_SHADOW, BEH_FRIENDLY, 2, 0, you.pos(), - MHITYOU)); + create_monster(mgen_data(MONS_SHADOW, BEH_FRIENDLY, &you, 2, 0, + you.pos(), MHITYOU)); item_def *lantern = you.weapon(); @@ -336,7 +336,7 @@ static bool evoke_horn_of_geryon() { mpr("You produce a hideous howling noise!", MSGCH_SOUND); create_monster( - mgen_data::hostile_at(MONS_BEAST, + mgen_data::hostile_at(MONS_BEAST, "the horn of Geryon", true, 4, 0, you.pos())); } return (rc); @@ -352,7 +352,7 @@ static bool _efreet_flask(int slot) create_monster( mgen_data(MONS_EFREET, friendly ? BEH_FRIENDLY : BEH_HOSTILE, - 0, 0, you.pos(), + &you, 0, 0, you.pos(), MHITYOU, MG_FORCE_BEH)); if (monster != -1) @@ -530,6 +530,7 @@ void tome_of_power(int slot) { if (create_monster( mgen_data::hostile_at(MONS_ABOMINATION_SMALL, + "a tome of Destruction", true, 6, 0, you.pos())) != -1) { mpr("A horrible Thing appears!"); @@ -630,7 +631,7 @@ static bool _box_of_beasts(item_def &box) beha = BEH_HOSTILE; if (create_monster( - mgen_data(beasty, beha, 2 + random2(4), 0, + mgen_data(beasty, beha, &you, 2 + random2(4), 0, you.pos(), MHITYOU)) != -1) { success = true; |