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

[Server] Remove redundant SetResurrectType

Browse source 
Rename SendResurrect to Resurrect
This commit is contained in:
Koncord 2017-06-27 14:49:39 +08:00
parent 813a3c89c4
commit 9ab58b6708
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw-mp/Script/Functions/Death.cpp
View file

@ -7,19 +7,12 @@
#include <iostream>
using namespace std;
void DeathFunctions::SetResurrectType(unsigned short pid, unsigned int type)
{
Player *player;
GET_PLAYER(pid, player,);
player->resurrectType = type;
}
void DeathFunctions::SendResurrect(unsigned short pid) noexcept
void DeathFunctions::Resurrect(unsigned short pid, unsigned int type) noexcept
{
Player *player;
GET_PLAYER(pid, player, );
player->resurrectType = type;
mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_RESURRECT)->setPlayer(player);
mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_RESURRECT)->Send(false);
mwmp::Networking::get().getPlayerPacketController()->GetPacket(ID_PLAYER_RESURRECT)->Send(true);

8
apps/openmw-mp/Script/Functions/Death.hpp
View file

@ -4,16 +4,12 @@
#include "../Types.hpp"
#define DEATHAPI \
{"SetResurrectType", DeathFunctions::SetResurrectType},\
\
{"SendResurrect", DeathFunctions::SendResurrect}
{"Resurrect", DeathFunctions::Resurrect}
class DeathFunctions
{
public:
static void SetResurrectType(unsigned short pid, unsigned int type);
static void SendResurrect(unsigned short pid) noexcept;
static void Resurrect(unsigned short pid) noexcept;
};
#endif //OPENMW_DEATHAPI_HPP