Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 19:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Entities: Merge duplicate functions calculating relative positions - remove CalculatePassengerPosition/CalculatePassengerOffset from TransportBase class

Browse Source
This commit is contained in:
Shauren
2025-10-14 13:11:41 +02:00
parent d48e977315
commit a8f01e07d1
28 changed files with 141 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Garrison/Garrison.cpp
View File

@@ -670,7 +670,7 @@ GarrisonError Garrison::CheckBuildingRemoval(uint32 garrPlotInstanceId) const
return GARRISON_SUCCESS;
}
template<class T, void(T::*SecondaryRelocate)(float,float,float,float)>
template<class T, void(T::*SecondaryRelocate)(Position const&)>
T* BuildingSpawnHelper(GameObject* building, ObjectGuid::LowType spawnId, Map* map)
{
T* spawn = new T();
@@ -680,14 +680,10 @@ T* BuildingSpawnHelper(GameObject* building, ObjectGuid::LowType spawnId, Map* m
return nullptr;
}
float x = spawn->GetPositionX();
float y = spawn->GetPositionY();
float z = spawn->GetPositionZ();
float o = spawn->GetOrientation();
TransportBase::CalculatePassengerPosition(x, y, z, &o, building->GetPositionX(), building->GetPositionY(), building->GetPositionZ(), building->GetOrientation());
Position globalPosition = building->GetPositionWithOffset(spawn->GetPosition());
spawn->Relocate(x, y, z, o);
(spawn->*SecondaryRelocate)(x, y, z, o);
spawn->Relocate(globalPosition);
(spawn->*SecondaryRelocate)(globalPosition);
if (!spawn->IsPositionValid())
{