mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-03 05:36:42 +00:00
Code Issues Releases Wiki Activity

Add GetEquipmentSlotCount() to item script functions

Browse source
This commit is contained in:
David Cernat 2016-11-17 23:07:29 +02:00
parent fcd24ebb7e
commit 977e93288e
2 changed files with 24 additions and 13 deletions
apps/openmw-mp/Script/Functions
Items.cppItems.hpp

6
apps/openmw-mp/Script/Functions/Items.cpp
View file

@ -6,6 +6,7 @@
#include <apps/openmw-mp/Script/ScriptFunctions.hpp> #include <apps/openmw-mp/Script/ScriptFunctions.hpp>
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
#include <apps/openmw-mp/Networking.hpp> #include <apps/openmw-mp/Networking.hpp>
#include <apps/openmw/mwworld/inventorystore.hpp>
#include <components/misc/stringops.hpp> #include <components/misc/stringops.hpp>
using namespace mwmp; using namespace mwmp;
@ -40,6 +41,11 @@ void ItemFunctions::UnequipItem(unsigned short pid, unsigned short slot) noexcep
//ItemFunctions::EquipItem(pid, slot, "", 0); //ItemFunctions::EquipItem(pid, slot, "", 0);
} }
int ItemFunctions::GetEquipmentSlotCount() noexcept
{
return MWWorld::InventoryStore::Slots;
}
const char *ItemFunctions::GetItemSlot(unsigned short pid, unsigned short slot) noexcept const char *ItemFunctions::GetItemSlot(unsigned short pid, unsigned short slot) noexcept
{ {
Player *player; Player *player;

31
apps/openmw-mp/Script/Functions/Items.hpp
View file

@ -6,19 +6,22 @@
#define OPENMW_ITEMS_HPP #define OPENMW_ITEMS_HPP
#define ITEMAPI \ #define ITEMAPI \
{"AddItem", ItemFunctions::AddItem},\ {"AddItem", ItemFunctions::AddItem},\
{"RemoveItem", ItemFunctions::RemoveItem},\ {"RemoveItem", ItemFunctions::RemoveItem},\
{"GetItemCount", ItemFunctions::GetItemCount2},\ {"GetItemCount", ItemFunctions::GetItemCount2},\
{"EquipItem", ItemFunctions::EquipItem},\
{"UnequipItem", ItemFunctions::UnequipItem},\
{"GetItemSlot", ItemFunctions::GetItemSlot},\
{"HasItemEquipped", ItemFunctions::HasItemEquipped},\
{"GetItemName", ItemFunctions::GetItemName},\
{"GetItemHealth", ItemFunctions::GetItemHealth},\
{"GetInventorySize", ItemFunctions::GetInventorySize},\
\ \
{"SendEquipment", ItemFunctions::SendEquipment},\ {"EquipItem", ItemFunctions::EquipItem},\
{"SendInventory", ItemFunctions::SendInventory}\ {"UnequipItem", ItemFunctions::UnequipItem},\
{"GetEquipmentSlotCount", ItemFunctions::GetEquipmentSlotCount},\
{"HasItemEquipped", ItemFunctions::HasItemEquipped},\
\
{"GetItemSlot", ItemFunctions::GetItemSlot},\
{"GetItemName", ItemFunctions::GetItemName},\
{"GetItemHealth", ItemFunctions::GetItemHealth},\
{"GetInventorySize", ItemFunctions::GetInventorySize},\
\
{"SendEquipment", ItemFunctions::SendEquipment},\
{"SendInventory", ItemFunctions::SendInventory}
class ItemFunctions class ItemFunctions
{ {
@ -26,11 +29,13 @@ public:
static void AddItem(unsigned short pid, const char* itemName, unsigned int count, int health) noexcept; static void AddItem(unsigned short pid, const char* itemName, unsigned int count, int health) noexcept;
static void RemoveItem(unsigned short pid, const char* itemName, unsigned short count) noexcept; static void RemoveItem(unsigned short pid, const char* itemName, unsigned short count) noexcept;
static void GetItemCount(unsigned short pid, const char* itemName) noexcept; static void GetItemCount(unsigned short pid, const char* itemName) noexcept;
static void EquipItem(unsigned short pid, unsigned short slot, const char* itemName, unsigned int count, int health) noexcept; static void EquipItem(unsigned short pid, unsigned short slot, const char* itemName, unsigned int count, int health) noexcept;
static void UnequipItem(unsigned short pid, unsigned short slot) noexcept; static void UnequipItem(unsigned short pid, unsigned short slot) noexcept;
static int GetEquipmentSlotCount() noexcept;
static bool HasItemEquipped(unsigned short pid, const char* itemName); static bool HasItemEquipped(unsigned short pid, const char* itemName);
static const char *GetItemSlot(unsigned short pid, unsigned short slot) noexcept;
static const char *GetItemSlot(unsigned short pid, unsigned short slot) noexcept;
static const char *GetItemName(unsigned short pid, unsigned int i) noexcept; static const char *GetItemName(unsigned short pid, unsigned int i) noexcept;
static int GetItemCount2(unsigned short pid, unsigned int i) noexcept; static int GetItemCount2(unsigned short pid, unsigned int i) noexcept;
static int GetItemHealth(unsigned short pid, unsigned int i) noexcept; static int GetItemHealth(unsigned short pid, unsigned int i) noexcept;