summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index a3eca5e4b2..58487ff6a9 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -180,17 +180,6 @@ enum attribute_type
NUM_ATTRIBUTES
};
-enum quiver_type
-{
- QUIVER_THROW, // no launcher wielded -> darts, stones, ...
- QUIVER_BOW, // wielded bow -> arrows
- QUIVER_SLING, // wielded sling -> stones, sling bullets
- QUIVER_CROSSBOW, // wielded crossbow -> bolts
- QUIVER_HAND_CROSSBOW, // wielded hand crossbow -> darts
- QUIVER_BLOWGUN, // wielded blowgun -> needles
- NUM_QUIVER
-};
-
enum beam_type // beam[].flavour
{
BEAM_NONE, // 0
@@ -2637,8 +2626,8 @@ enum skill_type
SK_SLINGS,
SK_BOWS,
SK_CROSSBOWS,
- SK_DARTS,
- SK_THROWING,
+ // was darts, now unused
+ SK_THROWING = 11,
SK_ARMOUR,
SK_DODGING,
SK_STEALTH,
@@ -3124,7 +3113,6 @@ enum zap_type
ZAP_PARALYSIS,
ZAP_FIRE,
ZAP_COLD,
- ZAP_PRIMAL_WAVE,
ZAP_CONFUSION,
ZAP_INVISIBILITY,
ZAP_DIGGING,
@@ -3182,6 +3170,7 @@ enum zap_type
ZAP_SLIME,
ZAP_PORKALATOR,
ZAP_SLEEP,
+ ZAP_PRIMAL_WAVE,
ZAP_IOOD,
NUM_ZAPS
};