Core/Transports: undo all custom transport changes as preparation for cherry picks

This commit is contained in:
Ovahlord committed 2022-06-18 18:37:14 +02:00
1 parent 74c60fa456
commit 6e9ec1a4bf
46 files changed
+618 -1469

No files matched your search

+1 -1
View File
@@ -1568,7 +1568,7 @@ public:
static bool HandleDebugTransportCommand(ChatHandler* handler, char const* args)
{
MapTransport* transport = handler->GetSession()->GetPlayer()->GetMapTransport();
Transport* transport = handler->GetSession()->GetPlayer()->GetTransport();
if (!transport)
return false;
+4 -18
View File
@@ -39,7 +39,6 @@ EndScriptData */
#include "Player.h"
#include "PoolMgr.h"
#include "RBAC.h"
#include "Transport.h"
#include "WorldSession.h"
// definitions are over in cs_npc.cpp
@@ -154,19 +153,8 @@ public:
Player* player = handler->GetSession()->GetPlayer();
Map* map = player->GetMap();
GameObject* object = nullptr;
ObjectGuid::LowType guidLow = ObjectGuid::Empty;
if (objectInfo->type == GAMEOBJECT_TYPE_TRANSPORT)
{
object = new Transport();
guidLow = map->GenerateLowGuid<HighGuid::Transport>();
}
else
{
object = new GameObject();
guidLow = map->GenerateLowGuid<HighGuid::GameObject>();
}
GameObject* object = new GameObject;
ObjectGuid::LowType guidLow = map->GenerateLowGuid<HighGuid::GameObject>();
QuaternionData rotation = QuaternionData::fromEulerAnglesZYX(player->GetOrientation(), 0.f, 0.f);
if (!object->Create(guidLow, objectInfo->entry, map, *player, rotation, 255, GO_STATE_READY))
{
@@ -190,10 +178,8 @@ public:
// this is required to avoid weird behavior and memory leaks
delete object;
if (objectInfo->type == GAMEOBJECT_TYPE_TRANSPORT)
object = new Transport();
else
object = new GameObject();
object = new GameObject();
// this will generate a new guid if the object is in an instance
if (!object->LoadFromDB(guidLow, map, true))
{
+2 -2
View File
@@ -154,8 +154,8 @@ public:
// before GM
float x, y, z;
gmPlayer->GetPosition(x, y, z);
player->TeleportTo(gmPlayer->GetMapId(), x, y, z, player->GetOrientation(), 0, gmPlayer->GetTransport());
gmPlayer->GetClosePoint(x, y, z, player->GetCombatReach());
player->TeleportTo(gmPlayer->GetMapId(), x, y, z, player->GetOrientation());
}
return true;
+4 -8
View File
@@ -283,12 +283,8 @@ public:
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
if (Transport* transport = object->GetTransport())
{
int32 transMapID = -1;
if (transport->GetGoType() == GAMEOBJECT_TYPE_MO_TRANSPORT)
transMapID = transport->GetGOInfo()->moTransport.mapID;
handler->PSendSysMessage(LANG_TRANSPORT_POSITION,
transMapID, object->GetTransOffsetX(), object->GetTransOffsetY(), object->GetTransOffsetZ(), object->GetTransOffsetO(),
transport->GetGOInfo()->moTransport.mapID, object->GetTransOffsetX(), object->GetTransOffsetY(), object->GetTransOffsetZ(), object->GetTransOffsetO(),
transport->GetEntry(), transport->GetName().c_str());
}
handler->PSendSysMessage(LANG_GRID_POSITION,
@@ -456,9 +452,9 @@ public:
// to point to see at target with same orientation
float x, y, z;
target->GetPosition(x, y, z);
target->GetContactPoint(_player, x, y, z);
_player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE, target->GetTransport());
_player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE);
PhasingHandler::InheritPhaseShift(_player, target);
_player->UpdateObjectVisibility();
}
@@ -589,7 +585,7 @@ public:
// before GM
float x, y, z;
_player->GetPosition(x, y, z);
target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation(), 0, _player->GetTransport());
target->TeleportTo(_player->GetMapId(), x, y, z, target->GetOrientation());
PhasingHandler::InheritPhaseShift(target, handler->GetSession()->GetPlayer());
target->UpdateObjectVisibility();
}
+1 -1
View File
@@ -349,7 +349,7 @@ public:
Player* chr = handler->GetSession()->GetPlayer();
Map* map = chr->GetMap();
if (MapTransport* trans = chr->GetMapTransport())
if (Transport* trans = chr->GetTransport())
{
ObjectGuid::LowType guid = sObjectMgr->GenerateCreatureSpawnId();
CreatureData& data = sObjectMgr->NewOrExistCreatureData(guid);
@@ -31,7 +31,6 @@
#include "SpellMgr.h"
#include "SpellScript.h"
#include "TemporarySummon.h"
#include "Transport.h"
#include "halls_of_origination.h"
enum SunTouchedServant
@@ -781,7 +780,7 @@ struct go_hoo_the_makers_lift_controller : public GameObjectAI
return true;
// Handle elevator: gossip item index => stopFrame (floor index).
Transport* elevator = ObjectAccessor::GetTransportOnMap(*me, instance->GetGuidData(DATA_LIFT_OF_THE_MAKERS));
GameObject* elevator = instance->GetGameObject(DATA_LIFT_OF_THE_MAKERS);
if (!elevator)
return true;
@@ -1122,7 +1122,7 @@ class npc_jaina_or_sylvanas_escape_hor : public CreatureScript
me->RemoveAurasDueToSpell(SPELL_HARVEST_SOUL);
if (_instance->GetData(DATA_TEAM_IN_INSTANCE) == ALLIANCE)
Talk(SAY_JAINA_ESCAPE_9);
if (MapTransport* gunship = ObjectAccessor::GetMapTransportOnMap(*me, _instance->GetGuidData(DATA_GUNSHIP)))
if (Transport* gunship = ObjectAccessor::GetTransport(*me, _instance->GetGuidData(DATA_GUNSHIP)))
gunship->EnableMovement(true);
_instance->SetBossState(DATA_THE_LICH_KING_ESCAPE, DONE);
break;
@@ -1194,7 +1194,7 @@ class npc_the_lich_king_escape_hor : public CreatureScript
if (Creature* target = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_ESCAPE_LEADER)))
DoCast(target, SPELL_HARVEST_SOUL);
if (MapTransport* gunship = ObjectAccessor::GetMapTransportOnMap(*me, _instance->GetGuidData(DATA_GUNSHIP)))
if (Transport* gunship = ObjectAccessor::GetTransport(*me, _instance->GetGuidData(DATA_GUNSHIP)))
gunship->EnableMovement(true);
break;
default:
@@ -393,7 +393,7 @@ class instance_halls_of_reflection : public InstanceMapScript
_teamInInstance = player->GetTeam();
}
if (MapTransport* gunship = sTransportMgr->CreateTransport(_teamInInstance == HORDE ? GO_ORGRIMS_HAMMER : GO_THE_SKYBREAKER, 0, instance))
if (Transport* gunship = sTransportMgr->CreateTransport(_teamInInstance == HORDE ? GO_ORGRIMS_HAMMER : GO_THE_SKYBREAKER, 0, instance))
gunship->EnableMovement(GetBossState(DATA_THE_LICH_KING_ESCAPE) == DONE);
}
@@ -640,7 +640,7 @@ class instance_halls_of_reflection : public InstanceMapScript
if (GetBossState(DATA_THE_LICH_KING_ESCAPE) == DONE)
break;
if (MapTransport* gunship = instance->GetMapTransport(GunshipGUID))
if (Transport* gunship = instance->GetTransport(GunshipGUID))
gunship->EnableMovement(false);
if (Creature* jainaOrSylvanas = instance->GetCreature(JainaOrSylvanasEscapeGUID))
@@ -658,7 +658,7 @@ class instance_halls_of_reflection : public InstanceMapScript
}
break;
case EVENT_GUNSHIP_ARRIVAL_2:
if (MapTransport* gunship = instance->GetMapTransport(GunshipGUID))
if (Transport* gunship = instance->GetTransport(GunshipGUID))
gunship->EnableMovement(false);
for (ObjectGuid guid : GunshipStairGUIDs)
@@ -384,7 +384,7 @@ public:
ResetSlots(HORDE);
}
void SetTransport(MapTransport* transport) { _transport = transport; }
void SetTransport(Transport* transport) { _transport = transport; }
void ResetSlots(uint32 team)
{
@@ -455,7 +455,7 @@ private:
return newPos;
}
MapTransport* _transport;
Transport* _transport;
ObjectGuid _controlledSlots[MAX_SLOTS];
time_t _respawnCooldowns[MAX_SLOTS];
Position const* _spawnPoint;
@@ -495,7 +495,7 @@ public:
_caster->CastSpell(_caster, _spellId, true);
_caster->GetTransport()->AddObjectToRemoveList();
if (MapTransport* go = ObjectAccessor::GetMapTransport(_otherTransport))
if (Transport* go = HashMapHolder<Transport>::Find(_otherTransport))
go->AddObjectToRemoveList();
return true;
@@ -765,10 +765,10 @@ class npc_gunship : public CreatureScript
if (isVictory)
{
if (MapTransport* trans = ObjectAccessor::GetMapTransport(instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
trans->EnableMovement(true);
if (Transport* otherTransport = HashMapHolder<Transport>::Find(instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
otherTransport->EnableMovement(true);
me->GetMapTransport()->EnableMovement(true);
me->GetTransport()->EnableMovement(true);
if (Creature* ship = me->FindNearestCreature(_teamInInstance == HORDE ? NPC_ORGRIMS_HAMMER : NPC_THE_SKYBREAKER, 200.0f))
{
@@ -844,7 +844,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
_instance(creature->GetInstanceScript())
{
_controller.ResetSlots(HORDE);
_controller.SetTransport(creature->GetMapTransport());
_controller.SetTransport(creature->GetTransport());
me->setRegeneratingHealth(false);
me->m_CombatDistance = 70.0f;
_firstMageCooldown = GameTime::GetGameTime() + 60;
@@ -954,7 +954,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->GetMapTransport()->EnableMovement(true);
me->GetTransport()->EnableMovement(true);
_events.SetPhase(PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_H_1, 5000, 0, PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_H_2, 16000, 0, PHASE_INTRO);
@@ -1022,10 +1022,10 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
_controller.SummonCreatures(SLOT_MAGE_1, SLOT_MAGE_2);
_controller.SummonCreatures(SLOT_MARINE_1, Is25ManRaid() ? SLOT_MARINE_4 : SLOT_MARINE_2);
_controller.SummonCreatures(SLOT_SERGEANT_1, Is25ManRaid() ? SLOT_SERGEANT_2 : SLOT_SERGEANT_1);
if (MapTransport* orgrimsHammer = me->GetMapTransport())
if (Transport* orgrimsHammer = me->GetTransport())
orgrimsHammer->SummonPassenger(NPC_TELEPORT_PORTAL, OrgrimsHammerTeleportPortal, TEMPSUMMON_TIMED_DESPAWN, nullptr, 21000);
if (MapTransport* skybreaker = ObjectAccessor::GetMapTransport(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
if (Transport* skybreaker = HashMapHolder<Transport>::Find(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
skybreaker->SummonPassenger(NPC_TELEPORT_EXIT, SkybreakerTeleportExit, TEMPSUMMON_TIMED_DESPAWN, nullptr, 23000);
_events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6000);
@@ -1108,7 +1108,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
_instance(creature->GetInstanceScript())
{
_controller.ResetSlots(ALLIANCE);
_controller.SetTransport(creature->GetMapTransport());
_controller.SetTransport(creature->GetTransport());
me->setRegeneratingHealth(false);
me->m_CombatDistance = 70.0f;
_firstMageCooldown = GameTime::GetGameTime() + 60;
@@ -1218,7 +1218,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
bool GossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->GetMapTransport()->EnableMovement(true);
me->GetTransport()->EnableMovement(true);
_events.SetPhase(PHASE_INTRO);
_events.ScheduleEvent(EVENT_INTRO_A_1, 5000);
_events.ScheduleEvent(EVENT_INTRO_A_2, 10000, 0, PHASE_INTRO);
@@ -1290,10 +1290,10 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
_controller.SummonCreatures(SLOT_MAGE_1, SLOT_MAGE_2);
_controller.SummonCreatures(SLOT_MARINE_1, Is25ManRaid() ? SLOT_MARINE_4 : SLOT_MARINE_2);
_controller.SummonCreatures(SLOT_SERGEANT_1, Is25ManRaid() ? SLOT_SERGEANT_2 : SLOT_SERGEANT_1);
if (MapTransport* skybreaker = me->GetMapTransport())
if (Transport* skybreaker = me->GetTransport())
skybreaker->SummonPassenger(NPC_TELEPORT_PORTAL, SkybreakerTeleportPortal, TEMPSUMMON_TIMED_DESPAWN, nullptr, 21000);
if (MapTransport* orgrimsHammer = ObjectAccessor::GetMapTransport(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
if (Transport* orgrimsHammer = HashMapHolder<Transport>::Find(_instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
orgrimsHammer->SummonPassenger(NPC_TELEPORT_EXIT, OrgrimsHammerTeleportExit, TEMPSUMMON_TIMED_DESPAWN, nullptr, 23000);
_events.ScheduleEvent(EVENT_ADDS_BOARD_YELL, 6000);
@@ -1439,7 +1439,7 @@ struct npc_gunship_boarding_addAI : public gunship_npc_AI
if (!myTransport)
return;
if (MapTransport* destTransport = ObjectAccessor::GetMapTransport(Instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
if (Transport* destTransport = HashMapHolder<Transport>::Find(Instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE)))
destTransport->CalculatePassengerPosition(x, y, z, &o);
float angle = frand(0, float(M_PI) * 2.0f);
@@ -2288,7 +2288,7 @@ class spell_igb_gunship_fall_teleport : public SpellScriptLoader
void SelectTransport(WorldObject*& target)
{
if (InstanceScript* instance = target->GetInstanceScript())
target = ObjectAccessor::GetMapTransport(instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE));
target = HashMapHolder<Transport>::Find(instance->GetGuidData(DATA_ICECROWN_GUNSHIP_BATTLE));
}
void RelocateDest(SpellEffIndex /*effIndex*/)
@@ -123,7 +123,6 @@ class instance_icecrown_citadel : public InstanceMapScript
UpperSpireTeleporterActiveState = NOT_STARTED;
BloodPrinceIntro = 1;
SindragosaIntro = 1;
LadyDeathwhisperElevatorTimer = 3000;
}
// A function to help reduce the number of lines for teleporter management.
@@ -436,8 +435,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case GO_LADY_DEATHWHISPER_ELEVATOR:
LadyDeathwisperElevatorGUID = go->GetGUID();
if (GetBossState(DATA_LADY_DEATHWHISPER) == DONE)
if (Transport* transport = go->ToTransport())
transport->SetTransportState(GO_STATE_TRANSPORT_ACTIVE);
go->SetTransportState(GO_STATE_TRANSPORT_ACTIVE);
break;
case GO_THE_SKYBREAKER_H:
case GO_ORGRIMS_HAMMER_A:
@@ -896,7 +894,7 @@ class instance_icecrown_citadel : public InstanceMapScript
{
SetBossState(DATA_ICECROWN_GUNSHIP_BATTLE, NOT_STARTED);
uint32 gunshipEntry = TeamInInstance == HORDE ? GO_ORGRIMS_HAMMER_H : GO_THE_SKYBREAKER_A;
if (MapTransport* gunship = sTransportMgr->CreateTransport(gunshipEntry, 0, instance))
if (Transport* gunship = sTransportMgr->CreateTransport(gunshipEntry, 0, instance))
GunshipGUID = gunship->GetGUID();
}
}
@@ -1167,28 +1165,6 @@ class instance_icecrown_citadel : public InstanceMapScript
void Update(uint32 diff) override
{
if (LadyDeathwhisperElevatorTimer <= diff)
{
LadyDeathwhisperElevatorTimer = 3000;
if (GetBossState(DATA_LADY_DEATHWHISPER) == DONE)
{
if (Transport* elevator = instance->GetTransport(LadyDeathwisperElevatorGUID))
{
if (elevator->GetDestinationStopFrameTime() == elevator->GetCurrentTransportTime())
{
if (!elevator->GetCurrentTransportTime())
elevator->SetTransportState(GO_STATE_TRANSPORT_STOPPED, 1);
else
elevator->SetTransportState(GO_STATE_TRANSPORT_STOPPED, 0);
LadyDeathwhisperElevatorTimer = 20000;
}
}
}
}
else
LadyDeathwhisperElevatorTimer -= diff;
if (GetBossState(DATA_THE_LICH_KING) != IN_PROGRESS && GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != FAIL)
return;
@@ -1244,7 +1220,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case EVENT_PLAYERS_GUNSHIP_SPAWN:
case EVENT_PLAYERS_GUNSHIP_COMBAT:
if (GameObject* go = source->ToGameObject())
if (MapTransport* transport = go->ToMapTransport())
if (Transport* transport = go->ToTransport())
transport->EnableMovement(false);
break;
case EVENT_PLAYERS_GUNSHIP_SAURFANG:
@@ -1252,7 +1228,7 @@ class instance_icecrown_citadel : public InstanceMapScript
if (Creature* captain = source->FindNearestCreature(TeamInInstance == HORDE ? NPC_IGB_HIGH_OVERLORD_SAURFANG : NPC_IGB_MURADIN_BRONZEBEARD, 100.0f))
captain->AI()->DoAction(ACTION_EXIT_SHIP);
if (GameObject* go = source->ToGameObject())
if (MapTransport* transport = go->ToMapTransport())
if (Transport* transport = go->ToTransport())
transport->EnableMovement(false);
break;
}
@@ -1353,7 +1329,6 @@ class instance_icecrown_citadel : public InstanceMapScript
std::set<uint32> RimefangTrash;
uint8 BloodPrinceIntro;
uint8 SindragosaIntro;
uint32 LadyDeathwhisperElevatorTimer;
bool IsBonedEligible;
bool IsOozeDanceEligible;
bool IsNauseaEligible;
@@ -26,71 +26,6 @@
#include "ObjectMgr.h"
#include "SpellInfo.h"
enum DeeprunTram
{
MAP_DEEPRUN_TRAM = 369,
GO_SUBWAY = 176080,
MAX_SUBWAY_COUNT = 6
};
Position const SubwaysPos[MAX_SUBWAY_COUNT] =
{
{ 4.580650f, 28.20970f, 7.01107f, 1.5708f },
{ 4.528070f, 8.435290f, 7.01107f, 1.5708f },
{ -45.4005f, 2492.790f, 6.98860f, 1.5708f },
{ -45.4007f, 2512.150f, 6.98860f, 1.5708f },
{ -45.3934f, 2472.930f, 6.98860f, 1.5708f },
{ 4.498830f, -11.3475f, 7.01107f, 1.5708f }
};
static QuaternionData worldRotation = QuaternionData(0.0f, 0.0f, 0.7071066f, 0.7071069f);
static QuaternionData parentRotation = QuaternionData(0.0f, 0.0f, 1.0f, -0.0000000437114f);
class world_map_deeprun_tram: public WorldMapScript
{
public:
world_map_deeprun_tram() : WorldMapScript("world_map_deeprun_tram", MAP_DEEPRUN_TRAM)
{
Initialize();
}
void Initialize()
{
_initializedTrams = false;
}
void OnPlayerEnter(Map* map, Player* /*player*/) override
{
if (!_initializedTrams)
{
_initializedTrams = true;
for (uint8 i = 0; i < MAX_SUBWAY_COUNT; ++i)
{
GameObject* transport = new Transport();
if (!transport->Create(map->GenerateLowGuid<HighGuid::Transport>(), GO_SUBWAY + i, map, SubwaysPos[i], worldRotation, 255, GO_STATE_READY))
{
delete transport;
continue;
}
transport->SetParentRotation(parentRotation);
uint32 spawnId = sObjectMgr->GenerateGameObjectSpawnId();
transport->SetSpawnId(spawnId);
transport->setActive(true);
transport->SetFarVisible(true);
map->AddToMap(transport);
}
}
}
private:
bool _initializedTrams;
};
enum Gilneas
{
MAP_GILNEAS = 654,
@@ -162,6 +97,5 @@ class world_map_gilneas: public WorldMapScript
void AddSC_world_map_scripts()
{
new world_map_deeprun_tram();
new world_map_gilneas();
}