krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Server] Use script function to get spellbook action

Browse source
This commit is contained in:
David Cernat 2017-02-16 14:23:27 +02:00
parent 5b3fabdb9d
commit eba7d8408f
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/Networking.cpp
View file

@ -250,7 +250,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
DEBUG_PRINTF("ID_PLAYER_SPELLBOOK\n"); DEBUG_PRINTF("ID_PLAYER_SPELLBOOK\n");
myPacket->Read(player); myPacket->Read(player);
Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player->getId(), player->spellbookChanges.action); Script::Call<Script::CallbackIdentity("OnPlayerSpellbookChange")>(player->getId());
break; break;
} }

8
apps/openmw-mp/Script/Functions/Spells.cpp
View file

@ -14,6 +14,14 @@ unsigned int SpellFunctions::GetSpellbookChangesSize(unsigned short pid) noexcep
return player->spellbookChanges.count; return player->spellbookChanges.count;
} }
unsigned int SpellFunctions::GetSpellbookAction(unsigned short pid) noexcept
{
Player *player;
GET_PLAYER(pid, player, 0);
return player->spellbookChanges.action;
}
void SpellFunctions::AddSpell(unsigned short pid, const char* spellId) noexcept void SpellFunctions::AddSpell(unsigned short pid, const char* spellId) noexcept
{ {
Player *player; Player *player;

2
apps/openmw-mp/Script/Functions/Spells.hpp
View file

@ -3,6 +3,7 @@
#define SPELLAPI \ #define SPELLAPI \
{"GetSpellbookChangesSize", SpellFunctions::GetSpellbookChangesSize},\ {"GetSpellbookChangesSize", SpellFunctions::GetSpellbookChangesSize},\
{"GetSpellbookAction", SpellFunctions::GetSpellbookAction},\
\ \
{"AddSpell", SpellFunctions::AddSpell},\ {"AddSpell", SpellFunctions::AddSpell},\
{"RemoveSpell", SpellFunctions::RemoveSpell},\ {"RemoveSpell", SpellFunctions::RemoveSpell},\
@ -17,6 +18,7 @@ class SpellFunctions
public: public:
static unsigned int GetSpellbookChangesSize(unsigned short pid) noexcept; static unsigned int GetSpellbookChangesSize(unsigned short pid) noexcept;
static unsigned int GetSpellbookAction(unsigned short pid) noexcept;
static void AddSpell(unsigned short pid, const char* spellId) noexcept; static void AddSpell(unsigned short pid, const char* spellId) noexcept;
static void RemoveSpell(unsigned short pid, const char* spellId) noexcept; static void RemoveSpell(unsigned short pid, const char* spellId) noexcept;

2
apps/openmw-mp/Script/ScriptFunctions.hpp
View file

@ -115,7 +115,7 @@ public:
{"OnPlayerLevelChange", Function<void, unsigned short>()}, {"OnPlayerLevelChange", Function<void, unsigned short>()},
{"OnPlayerEquipmentChange", Function<void, unsigned short>()}, {"OnPlayerEquipmentChange", Function<void, unsigned short>()},
{"OnPlayerInventoryChange", Function<void, unsigned short>()}, {"OnPlayerInventoryChange", Function<void, unsigned short>()},
{"OnPlayerSpellbookChange", Function<void, unsigned short, int>()}, {"OnPlayerSpellbookChange", Function<void, unsigned short>()},
{"OnPlayerJournalChange", Function<void, unsigned short>()}, {"OnPlayerJournalChange", Function<void, unsigned short>()},
{"OnObjectPlace", Function<void, unsigned short, const char*>()}, {"OnObjectPlace", Function<void, unsigned short, const char*>()},
{"OnObjectDelete", Function<void, unsigned short, const char*>()}, {"OnObjectDelete", Function<void, unsigned short, const char*>()},