nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

remove extra potion enums

Browse Source 
Generic object handling ended up not using FIRST_POTION, LAST_POTION,
and NUM_POTIONS so don't bother setting those up.
This commit is contained in:
PatR
2023-01-12 14:54:05 -08:00
parent 5b27e25d6d
commit 0649f5860a
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/objclass.h
-1
View File
@@ -171,7 +171,6 @@ enum objects_nums {
}; };
enum misc_object_nums { enum misc_object_nums {
NUM_POTIONS = (LAST_POTION - FIRST_POTION + 1),
NUM_REAL_GEMS = (LAST_REAL_GEM - FIRST_REAL_GEM + 1), NUM_REAL_GEMS = (LAST_REAL_GEM - FIRST_REAL_GEM + 1),
NUM_GLASS_GEMS = (LAST_GLASS_GEM - FIRST_GLASS_GEM + 1), NUM_GLASS_GEMS = (LAST_GLASS_GEM - FIRST_GLASS_GEM + 1),
/* LAST_SPELL is SPE_BLANK_PAPER, guaranteeing that spl_book[] will /* LAST_SPELL is SPE_BLANK_PAPER, guaranteeing that spl_book[] will
include/objects.h
-2
View File
@@ -1073,7 +1073,6 @@ FOOD("tin", 75, 0, 10, 1, METAL, 0, HI_METAL, TIN),
power, POTION_CLASS, prob, 0, 20, cost, 0, 0, 0, 0, 10, color, sn) power, POTION_CLASS, prob, 0, 20, cost, 0, 0, 0, 0, 10, color, sn)
POTION("gain ability", "ruby", 1, 0, 42, 300, CLR_RED, POTION("gain ability", "ruby", 1, 0, 42, 300, CLR_RED,
POT_GAIN_ABILITY), POT_GAIN_ABILITY),
MARKER(FIRST_POTION, POT_GAIN_ABILITY)
POTION("restore ability", "pink", 1, 0, 40, 100, CLR_BRIGHT_MAGENTA, POTION("restore ability", "pink", 1, 0, 40, 100, CLR_BRIGHT_MAGENTA,
POT_RESTORE_ABILITY), POT_RESTORE_ABILITY),
POTION("confusion", "orange", 1, CONFUSION, 42, 100, CLR_ORANGE, POTION("confusion", "orange", 1, CONFUSION, 42, 100, CLR_ORANGE,
@@ -1126,7 +1125,6 @@ POTION("oil", "murky", 0, 0, 30, 250, CLR_BROWN,
*/ */
POTION("water", "clear", 0, 0, 92, 100, CLR_CYAN, POTION("water", "clear", 0, 0, 92, 100, CLR_CYAN,
POT_WATER), POT_WATER),
MARKER(LAST_POTION, POT_WATER)
#undef POTION #undef POTION
/* scrolls ... */ /* scrolls ... */
src/allmain.c
-3
View File
@@ -1058,9 +1058,6 @@ dump_enums(void)
static const struct enum_dump omdump[] = { static const struct enum_dump omdump[] = {
dump_om(FIRST_AMULET), dump_om(FIRST_AMULET),
dump_om(LAST_AMULET), dump_om(LAST_AMULET),
dump_om(FIRST_POTION),
dump_om(LAST_POTION),
dump_om(NUM_POTIONS),
dump_om(FIRST_SPELL), dump_om(FIRST_SPELL),
dump_om(LAST_SPELL), dump_om(LAST_SPELL),
dump_om(MAXSPELL), dump_om(MAXSPELL),