diff --git a/Source/itemdat.h b/Source/itemdat.h index 8414bfe15..01ea63ed8 100644 --- a/Source/itemdat.h +++ b/Source/itemdat.h @@ -222,7 +222,7 @@ enum item_cursor_graphic : uint8_t { // clang-format on }; -enum item_type : int8_t { +enum ItemType : int8_t { ITYPE_MISC, ITYPE_SWORD, ITYPE_AXE, @@ -428,7 +428,7 @@ struct ItemData { enum item_class iClass; enum item_equip_type iLoc; enum item_cursor_graphic iCurs; - enum item_type itype; + enum ItemType itype; enum unique_base_item iItemId; const char *iName; const char *iSName; diff --git a/Source/items.cpp b/Source/items.cpp index b17a3e0a5..a7c835a59 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -2898,7 +2898,7 @@ void CalcPlrItemVals(Player &player, bool loadgfx) player._pBlockFlag = true; } - item_type weaponItemType = item_type::ITYPE_NONE; + ItemType weaponItemType = ItemType::ITYPE_NONE; bool holdsShield = false; if (!player.InvBody[INVLOC_HAND_LEFT].isEmpty() && player.InvBody[INVLOC_HAND_LEFT]._iClass == ICLASS_WEAPON diff --git a/Source/items.h b/Source/items.h index 8622988a1..19d7bc42b 100644 --- a/Source/items.h +++ b/Source/items.h @@ -175,7 +175,7 @@ struct Item { /** Randomly generated identifier */ int32_t _iSeed; uint16_t _iCreateInfo; - enum item_type _itype; + enum ItemType _itype; Point position; bool _iAnimFlag; /* diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp index fe0d2d6ef..42dbe889c 100644 --- a/Source/loadsave.cpp +++ b/Source/loadsave.cpp @@ -212,7 +212,7 @@ void LoadItemData(LoadHelper &file, Item &item) item._iSeed = file.NextLE(); item._iCreateInfo = file.NextLE(); file.Skip(2); // Alignment - item._itype = static_cast(file.NextLE()); + item._itype = static_cast(file.NextLE()); item.position.x = file.NextLE(); item.position.y = file.NextLE(); item._iAnimFlag = file.NextBool32();