From bea5c32865b925d7c2e994554cfb66853242d63a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 19 Apr 2008 10:18:52 +0000 Subject: 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 --- crawl-ref/source/beam.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/beam.h') 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 ); -- cgit v1.2.3-54-g00ecf