diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 10:18:52 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 10:18:52 +0000 |
| commit | bea5c32865b925d7c2e994554cfb66853242d63a (patch) | |
| tree | 36febf7d864d4f6551450c01938f2733998ec17c /crawl-ref/source/beam.h | |
| parent | 351df26a45219be708eafc947bb359e5dd8c90c2 (diff) | |
| download | crawl-ref-bea5c32865b925d7c2e994554cfb66853242d63a.tar.gz crawl-ref-bea5c32865b925d7c2e994554cfb66853242d63a.zip | |
Cleanup of beam.cc and direct.cc.
Comparisons for missiles are done with the actual item now, rather than
beam.name, so this fixes (user specified) randart names containing "poisoned"
being actually poisoning. I guess this would also allow printing the
stats in the hiscores when killed by a thrown weapon.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4360 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.h')
| -rw-r--r-- | crawl-ref/source/beam.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h index a384ddd6d1..2712a7dfcf 100644 --- a/crawl-ref/source/beam.h +++ b/crawl-ref/source/beam.h @@ -93,7 +93,7 @@ enum zap_type ZAP_POISON_ARROW, ZAP_BREATHE_STICKY_FLAME, ZAP_BREATHE_LIGHTNING, - ZAP_PETRIFY, + ZAP_PETRIFY, ZAP_HELLFROST, NUM_ZAPS // must remain last member {dlb} }; @@ -124,7 +124,7 @@ struct bolt bool is_energy; // mostly energy/non-physical attack bool is_launched; // was fired from launcher? bool is_thrown; // was thrown from hand? - bool target_first; // targeting by direction + bool target_first; // targeting by direction bool aimed_at_spot; // aimed at (x,y), should not cross std::string aux_source; // source of KILL_MISC beams @@ -241,7 +241,7 @@ void mimic_alert( monsters *mimic ); void zapping( zap_type ztype, int power, struct bolt &pbolt ); -int affect(bolt &beam, int x, int y); +int affect(bolt &beam, int x, int y, item_def *item = NULL); void beam_drop_object( bolt &beam, item_def *item, int x, int y ); |