diff --git a/Source/itemdat.h b/Source/itemdat.h index 3447f5f12..a057f8c78 100644 --- a/Source/itemdat.h +++ b/Source/itemdat.h @@ -380,20 +380,20 @@ enum item_misc_id : int8_t { IMISC_USEFIRST, IMISC_FULLHEAL, IMISC_HEAL, - IMISC_OLDHEAL, - IMISC_DEADHEAL, + IMISC_0x4, // Unused + IMISC_0x5, // Unused IMISC_MANA, IMISC_FULLMANA, - IMISC_POTEXP, /* add experience */ - IMISC_POTFORG, /* remove experience */ + IMISC_0x8, // Unused + IMISC_0x9, // Unused IMISC_ELIXSTR, IMISC_ELIXMAG, IMISC_ELIXDEX, IMISC_ELIXVIT, - IMISC_ELIXWEAK, /* double check with alpha */ - IMISC_ELIXDIS, - IMISC_ELIXCLUM, - IMISC_ELIXSICK, + IMISC_0xE, // Unused + IMISC_0xF, // Unused + IMISC_0x10, // Unused + IMISC_0x11, // Unused IMISC_REJUV, IMISC_FULLREJUV, IMISC_USELAST, @@ -404,7 +404,7 @@ enum item_misc_id : int8_t { IMISC_RING, IMISC_AMULET, IMISC_UNIQUE, - IMISC_FOOD, /* from demo/PSX */ + IMISC_0x1C, // Unused IMISC_OILFIRST, IMISC_OILOF, /* oils are beta or hellfire only */ IMISC_OILACC, @@ -421,7 +421,7 @@ enum item_misc_id : int8_t { IMISC_MAPOFDOOM, IMISC_EAR, IMISC_SPECELIX, - IMISC_0x2D, // Unknown + IMISC_0x2D, // Unused IMISC_RUNEFIRST, IMISC_RUNEF, IMISC_RUNEL, diff --git a/Source/items.cpp b/Source/items.cpp index 33175a20b..49545adb5 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1728,12 +1728,6 @@ void PrintItemOil(char iDidx) case IMISC_HEAL: AddPanelString(_("restore some life")); break; - case IMISC_OLDHEAL: - AddPanelString(_("recover life")); - break; - case IMISC_DEADHEAL: - AddPanelString(_("deadly heal")); - break; case IMISC_MANA: AddPanelString(_("restore some mana")); break; @@ -1752,16 +1746,6 @@ void PrintItemOil(char iDidx) case IMISC_ELIXVIT: AddPanelString(_("increase vitality")); break; - case IMISC_ELIXWEAK: - case IMISC_ELIXDIS: - AddPanelString(_("decrease strength")); - break; - case IMISC_ELIXCLUM: - AddPanelString(_("decrease dexterity")); - break; - case IMISC_ELIXSICK: - AddPanelString(_("decrease vitality")); - break; case IMISC_REJUV: AddPanelString(_("restore some life and mana")); break; @@ -3855,7 +3839,6 @@ void UseItem(int pnum, item_misc_id mid, spell_id spl) switch (mid) { case IMISC_HEAL: - case IMISC_FOOD: player.RestorePartialLife(); if (&player == MyPlayer) { drawhpflag = true;