evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert bag slot index type to uint8_t for now

Browse Source 
was causing incompatibility on vanilla servers - need to add net element filters for legacy/modified servers first
This commit is contained in:
Kae 2023-10-31 08:13:12 +11:00
parent 7d948f8839
commit ae014e5b6f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/game/StarInventoryTypes.hpp
View File

@ -19,7 +19,7 @@ enum class EquipmentSlot : uint8_t {
}; };
extern EnumMap<EquipmentSlot> const EquipmentSlotNames; extern EnumMap<EquipmentSlot> const EquipmentSlotNames;
typedef pair<String, unsigned> BagSlot; typedef pair<String, uint8_t> BagSlot;
strong_typedef(Empty, SwapSlot); strong_typedef(Empty, SwapSlot);
strong_typedef(Empty, TrashSlot); strong_typedef(Empty, TrashSlot);

2
source/game/scripting/StarLuaGameConverters.cpp
View File

@ -31,7 +31,7 @@ Maybe<InventorySlot> LuaConverter<InventorySlot>::to(LuaEngine&, LuaValue const&
return {}; return {};
} }
else if (auto table = v.ptr<LuaTable>()) else if (auto table = v.ptr<LuaTable>())
return {BagSlot(table->get<LuaString>(1).toString(), table->get<unsigned>(2))}; return {BagSlot(table->get<LuaString>(1).toString(), (uint8_t)table->get<unsigned>(2))};
else else
return {}; return {};
} }