diff options
| author | Neil Moore <neil@s-z.org> | 2012-09-09 11:34:26 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2012-09-09 11:37:47 -0400 |
| commit | 9ddb116061520eef8ac28fc53f43a03233423a57 (patch) | |
| tree | 83733b13579f038a9303c4fd8e8eea33dc0e26d4 /crawl-ref/source/fineff.h | |
| parent | eb3e8b2b0782699cd175e4e8d211384a8670a4f8 (diff) | |
| download | crawl-ref-9ddb116061520eef8ac28fc53f43a03233423a57.tar.gz crawl-ref-9ddb116061520eef8ac28fc53f43a03233423a57.zip | |
Fix an overload that should have been an override.
That const wasn't supposed to be there.
Also, remove an enum that is no longer needed. It shouldn't have been
added in the first place.
Diffstat (limited to 'crawl-ref/source/fineff.h')
| -rw-r--r-- | crawl-ref/source/fineff.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/crawl-ref/source/fineff.h b/crawl-ref/source/fineff.h index bb512a62d2..b2eb7f4969 100644 --- a/crawl-ref/source/fineff.h +++ b/crawl-ref/source/fineff.h @@ -7,17 +7,6 @@ #ifndef FINEFF_H #define FINEFF_H -enum final_effect_flavour -{ - FINEFF_LIGHTNING_DISCHARGE, - FINEFF_MIRROR_DAMAGE, - FINEFF_TRAMPLE_FOLLOW, - FINEFF_BLINK, - FINEFF_DISTORTION_TELEPORT, - FINEFF_ROYAL_JELLY_SPAWN, - FINEFF_BLOOD, -}; - class final_effect { public: @@ -30,7 +19,7 @@ public: virtual ~final_effect() {} virtual bool mergeable(const final_effect &a) const = 0; - virtual void merge(const final_effect &a) const + virtual void merge(const final_effect &a) { } |