yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mangos GetDist methods - no exact dist methods on mangos based

Browse Source
This commit is contained in:
Rochet2
2015-03-08 16:33:56 +02:00
parent 210f36ba54
commit 7cb61f6259
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
WorldObjectMethods.h
View File

@@ -468,16 +468,25 @@ namespace LuaWorldObject
*/ */
int GetExactDistance(Eluna* /*E*/, lua_State* L, WorldObject* obj) int GetExactDistance(Eluna* /*E*/, lua_State* L, WorldObject* obj)
{ {
float x, y, z;
obj->GetPosition(x, y, z);
WorldObject* target = Eluna::CHECKOBJ<WorldObject>(L, 2, false); WorldObject* target = Eluna::CHECKOBJ<WorldObject>(L, 2, false);
if (target && target->IsInWorld()) if (target && target->IsInWorld())
Eluna::Push(L, obj->GetExactDist(target)); {
float x2, y2, z2;
target->GetPosition(x2, y2, z2);
x -= x2;
y -= y2;
z -= z2;
}
else else
{ {
float X = Eluna::CHECKVAL<float>(L, 2); x -= Eluna::CHECKVAL<float>(L, 2);
float Y = Eluna::CHECKVAL<float>(L, 3); y -= Eluna::CHECKVAL<float>(L, 3);
float Z = Eluna::CHECKVAL<float>(L, 4); z -= Eluna::CHECKVAL<float>(L, 4);
Eluna::Push(L, obj->GetExactDist(X, Y, Z));
} }
Eluna::Push(L, std::sqrt(x*x + y*y + z*z));
return 1; return 1;
} }
@@ -525,15 +534,23 @@ namespace LuaWorldObject
*/ */
int GetExactDistance2d(Eluna* /*E*/, lua_State* L, WorldObject* obj) int GetExactDistance2d(Eluna* /*E*/, lua_State* L, WorldObject* obj)
{ {
float x, y, z;
obj->GetPosition(x, y, z);
WorldObject* target = Eluna::CHECKOBJ<WorldObject>(L, 2, false); WorldObject* target = Eluna::CHECKOBJ<WorldObject>(L, 2, false);
if (target && target->IsInWorld()) if (target && target->IsInWorld())
Eluna::Push(L, obj->GetExactDist2d(target)); {
float x2, y2, z2;
target->GetPosition(x2, y2, z2);
x -= x2;
y -= y2;
}
else else
{ {
float X = Eluna::CHECKVAL<float>(L, 2); x -= Eluna::CHECKVAL<float>(L, 2);
float Y = Eluna::CHECKVAL<float>(L, 3); y -= Eluna::CHECKVAL<float>(L, 3);
Eluna::Push(L, obj->GetExactDist2d(X, Y));
} }
Eluna::Push(L, std::sqrt(x*x + y*y));
return 1; return 1;
} }