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

[Server] Use consistent names for rotation script functions

Browse source
This commit is contained in:
David Cernat 2017-06-10 17:06:09 +03:00
parent bea3afaec8
commit 0d3976950b
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ double PositionFunctions::GetPosZ(unsigned short pid) noexcept
return player->position.pos[2];
}
void PositionFunctions::GetAngle(unsigned short pid, float *x, float *y, float *z) noexcept
void PositionFunctions::GetRot(unsigned short pid, float *x, float *y, float *z) noexcept
{
*x = 0.00;
*y = 0.00;
@ -59,7 +59,7 @@ void PositionFunctions::GetAngle(unsigned short pid, float *x, float *y, float *
*z = player->position.rot[2];
}
double PositionFunctions::GetAngleX(unsigned short pid) noexcept
double PositionFunctions::GetRotX(unsigned short pid) noexcept
{
Player *player;
GET_PLAYER(pid, player, 0.0f);
@ -67,7 +67,7 @@ double PositionFunctions::GetAngleX(unsigned short pid) noexcept
return player->position.rot[0];
}
double PositionFunctions::GetAngleZ(unsigned short pid) noexcept
double PositionFunctions::GetRotZ(unsigned short pid) noexcept
{
Player *player;
GET_PLAYER(pid, player, 0.0f);
@ -85,7 +85,7 @@ void PositionFunctions::SetPos(unsigned short pid, double x, double y, double z)
player->position.pos[2] = z;
}
void PositionFunctions::SetAngle(unsigned short pid, double x, double z) noexcept
void PositionFunctions::SetRot(unsigned short pid, double x, double z) noexcept
{
Player *player;
GET_PLAYER(pid, player, );

22
apps/openmw-mp/Script/Functions/Positions.hpp
View file

@ -8,14 +8,14 @@
{"GetPosX", PositionFunctions::GetPosX},\
{"GetPosY", PositionFunctions::GetPosY},\
{"GetPosZ", PositionFunctions::GetPosZ},\
\
{"GetAngle", PositionFunctions::GetAngle},\
{"GetAngleX", PositionFunctions::GetAngleX},\
{"GetAngleZ", PositionFunctions::GetAngleZ},\
\
\
{"GetRot", PositionFunctions::GetRot},\
{"GetRotX", PositionFunctions::GetRotX},\
{"GetRotZ", PositionFunctions::GetRotZ},\
\
{"SetPos", PositionFunctions::SetPos},\
{"SetAngle", PositionFunctions::SetAngle},\
\
{"SetRot", PositionFunctions::SetRot},\
\
{"SendPos", PositionFunctions::SendPos}
@ -27,12 +27,12 @@ public:
static double GetPosY(unsigned short pid) noexcept;
static double GetPosZ(unsigned short pid) noexcept;
static void GetAngle(unsigned short pid, float *x, float *y, float *z) noexcept;
static double GetAngleX(unsigned short pid) noexcept;
static double GetAngleZ(unsigned short pid) noexcept;
static void GetRot(unsigned short pid, float *x, float *y, float *z) noexcept;
static double GetRotX(unsigned short pid) noexcept;
static double GetRotZ(unsigned short pid) noexcept;
static void SetPos(unsigned short pid, double x, double y, double z) noexcept;
static void SetAngle(unsigned short pid, double x, double z) noexcept;
static void SetRot(unsigned short pid, double x, double z) noexcept;
static void SendPos(unsigned short pid) noexcept;
};