AZEROTHCORE compatibility (#271)

* Done Compatible AZEROTHCORE.

* Fix TC build

* Try fix whitespace (trailing and tabs2spaces)

* Remove undefs and TC_LOG defines

* Revert indentation change

* Indentation and style change

* Add more possible SQL types to query

* change bg hooks OnBGEnd parameter type.
This commit is contained in:
ayase
2018-06-06 23:42:46 +08:00
committed by Rochet2
parent 2cedb8c5af
commit 9b5499db9c
31 changed files with 869 additions and 510 deletions

View File

@@ -23,10 +23,10 @@ namespace LuaVehicle
int IsOnBoard(lua_State* L, Vehicle* vehicle)
{
Unit* passenger = Eluna::CHECKOBJ<Unit>(L, 2);
#ifndef TRINITY
Eluna::Push(L, vehicle->HasOnBoard(passenger));
#else
#if defined TRINITY || AZEROTHCORE
Eluna::Push(L, passenger->IsOnVehicle(vehicle->GetBase()));
#else
Eluna::Push(L, vehicle->HasOnBoard(passenger));
#endif
return 1;
}
@@ -38,10 +38,10 @@ namespace LuaVehicle
*/
int GetOwner(lua_State* L, Vehicle* vehicle)
{
#ifndef TRINITY
Eluna::Push(L, vehicle->GetOwner());
#else
#if defined TRINITY || AZEROTHCORE
Eluna::Push(L, vehicle->GetBase());
#else
Eluna::Push(L, vehicle->GetOwner());
#endif
return 1;
}
@@ -53,10 +53,10 @@ namespace LuaVehicle
*/
int GetEntry(lua_State* L, Vehicle* vehicle)
{
#ifndef TRINITY
Eluna::Push(L, vehicle->GetVehicleEntry()->m_ID);
#else
#if defined TRINITY || AZEROTHCORE
Eluna::Push(L, vehicle->GetVehicleInfo()->m_ID);
#else
Eluna::Push(L, vehicle->GetVehicleEntry()->m_ID);
#endif
return 1;
}
@@ -84,11 +84,11 @@ namespace LuaVehicle
{
Unit* passenger = Eluna::CHECKOBJ<Unit>(L, 2);
int8 seatId = Eluna::CHECKVAL<int8>(L, 3);
#ifndef TRINITY
#if defined TRINITY || AZEROTHCORE
vehicle->AddPassenger(passenger, seatId);
#else
if (vehicle->CanBoard(passenger))
vehicle->Board(passenger, seatId);
#else
vehicle->AddPassenger(passenger, seatId);
#endif
return 0;
}
@@ -101,10 +101,10 @@ namespace LuaVehicle
int RemovePassenger(lua_State* L, Vehicle* vehicle)
{
Unit* passenger = Eluna::CHECKOBJ<Unit>(L, 2);
#ifndef TRINITY
vehicle->UnBoard(passenger, false);
#else
#if defined TRINITY || AZEROTHCORE
vehicle->RemovePassenger(passenger);
#else
vehicle->UnBoard(passenger, false);
#endif
return 0;
}
@@ -112,4 +112,4 @@ namespace LuaVehicle
#endif // CLASSIC
#endif // TBC
#endif // VEHICLEMETHODS_H
#endif // VEHICLEMETHODS_H