mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

[Server] Use consistent names for rotation script functions

Browse Source
pull/249/merge
David Cernat 8 years ago
parent bea3afaec8
commit 0d3976950b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

8
apps/openmw-mp/Script/Functions/Positions.cpp
Unescape Escape View File

@ -45,7 +45,7 @@ double PositionFunctions::GetPosZ(unsigned short pid) noexcept
return player->position.pos[2]; 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; *x = 0.00;
*y = 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]; *z = player->position.rot[2];
} }
double PositionFunctions::GetAngleX(unsigned short pid) noexcept double PositionFunctions::GetRotX(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0.0f); GET_PLAYER(pid, player, 0.0f);
@ -67,7 +67,7 @@ double PositionFunctions::GetAngleX(unsigned short pid) noexcept
return player->position.rot[0]; return player->position.rot[0];
} }
double PositionFunctions::GetAngleZ(unsigned short pid) noexcept double PositionFunctions::GetRotZ(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player, 0.0f); 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; 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; Player *player;
GET_PLAYER(pid, player, ); GET_PLAYER(pid, player, );

22
apps/openmw-mp/Script/Functions/Positions.hpp
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save