diff --git a/ryzom/common/src/game_share/inventories.cpp b/ryzom/common/src/game_share/inventories.cpp index f4ee24915..bb867f992 100644 --- a/ryzom/common/src/game_share/inventories.cpp +++ b/ryzom/common/src/game_share/inventories.cpp @@ -33,6 +33,7 @@ namespace INVENTORIES NL_STRING_CONVERSION_TABLE_ENTRY(handling) NL_STRING_CONVERSION_TABLE_ENTRY(temporary) NL_STRING_CONVERSION_TABLE_ENTRY(equipment) + NL_STRING_CONVERSION_TABLE_ENTRY(hotbar) NL_STRING_CONVERSION_TABLE_ENTRY(bag) NL_STRING_CONVERSION_TABLE_ENTRY(pet_animal1) NL_STRING_CONVERSION_TABLE_ENTRY(pet_animal2) @@ -49,7 +50,6 @@ namespace INVENTORIES NL_STRING_CONVERSION_TABLE_ENTRY(reward_sharing) NL_STRING_CONVERSION_TABLE_ENTRY(guild) NL_STRING_CONVERSION_TABLE_ENTRY(player_room) - NL_STRING_CONVERSION_TABLE_ENTRY(hotbar) NL_END_STRING_CONVERSION_TABLE(TInventory, InventoryToString, UNDEFINED) @@ -95,6 +95,7 @@ namespace INVENTORIES "TEMP", // temporary // "", // pick-up "EQUIP", // equipment + "HOTBAR", // hotbar "", // bag "", // pack_animal1 "", // pack_animal2 @@ -109,7 +110,6 @@ namespace INVENTORIES // "", // exchange_proposition "", // guild "", // player_room - "HOTBAR", // hotbar "" // unknown }; diff --git a/ryzom/common/src/game_share/inventories.h b/ryzom/common/src/game_share/inventories.h index 076038950..7142140f4 100644 --- a/ryzom/common/src/game_share/inventories.h +++ b/ryzom/common/src/game_share/inventories.h @@ -158,8 +158,9 @@ namespace INVENTORIES handling = 0, temporary, // 1 equipment, // 2 - bag, // 3 - pet_animal, // 4 Character can have 7 pack animal + hotbar, // 3 + bag, // 4 + pet_animal, // 5 Character can have 7 pack animal pet_animal1 = pet_animal, // for toString => TInventory convertion pet_animal2, pet_animal3, @@ -167,18 +168,17 @@ namespace INVENTORIES pet_animal5, pet_animal6, pet_animal7, - max_pet_animal, // 11 - NUM_INVENTORY = max_pet_animal, // 11 - UNDEFINED = NUM_INVENTORY, // 11 + max_pet_animal, // 12 + NUM_INVENTORY = max_pet_animal, // 12 + UNDEFINED = NUM_INVENTORY, // 12 - exchange, // 12 This is not a bug : exchange is a fake inventory - exchange_proposition, // 13 and should not count in the number of inventory + exchange, // 13 This is not a bug : exchange is a fake inventory + exchange_proposition, // 14 and should not count in the number of inventory // same for botChat trading. - trading, // 14 - reward_sharing, // 15 fake inventory, not in database.xml. Used by the item info protocol only - guild, // 16 (warning: number stored in guild saved file) - player_room, // 17 - hotbar, // 18 + trading, // 15 + reward_sharing, // 16 fake inventory, not in database.xml. Used by the item info protocol only + guild, // 17 (warning: number stored in guild saved file) + player_room, // 18 NUM_ALL_INVENTORY // warning: distinct from NUM_INVENTORY };