diff options
| author | Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> | 2024-09-03 13:41:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-03 14:41:31 -0300 |
| commit | 1edac37ac37dfbfdc5f4d1ba36140dc077f06236 (patch) | |
| tree | 3fcc7413a65a54e9e9508388a1b2991484c14d4f /src/server/game/Scripting/ScriptDefines | |
| parent | e3e4133e883f13a880a7281b66488ee529cf392e (diff) | |
refactor(Core): Make more use of helpers. (#19835)
* Init.
* Reword.
* Update codestyle script.
Co-Authored-By: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
* Add gameobject type ID check, reorder checks.
* Add helper/codestyle check for unit type.
* `IsUnit()` -> `IsCreature()`
* Add `IsUnit()` method.
* Use type mask.
https: //github.com/TrinityCore/TrinityCore/commit/cc71da35b5dc74abf71f8691161525a23d870bb5
Co-Authored-By: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-Authored-By: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
* Replace instances of `isType` with `IsUnit`.
---------
Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Co-authored-by: Ovahlord <18347559+Ovahlord@users.noreply.github.com>
Diffstat (limited to 'src/server/game/Scripting/ScriptDefines')
| -rw-r--r-- | src/server/game/Scripting/ScriptDefines/VehicleScript.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp b/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp index ae58a8cd52..590050f4d4 100644 --- a/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/VehicleScript.cpp @@ -22,7 +22,7 @@ void ScriptMgr::OnInstall(Vehicle* veh) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) { @@ -33,7 +33,7 @@ void ScriptMgr::OnInstall(Vehicle* veh) void ScriptMgr::OnUninstall(Vehicle* veh) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) { @@ -44,7 +44,7 @@ void ScriptMgr::OnUninstall(Vehicle* veh) void ScriptMgr::OnReset(Vehicle* veh) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) { @@ -55,7 +55,7 @@ void ScriptMgr::OnReset(Vehicle* veh) void ScriptMgr::OnInstallAccessory(Vehicle* veh, Creature* accessory) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); ASSERT(accessory); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) @@ -67,7 +67,7 @@ void ScriptMgr::OnInstallAccessory(Vehicle* veh, Creature* accessory) void ScriptMgr::OnAddPassenger(Vehicle* veh, Unit* passenger, int8 seatId) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); ASSERT(passenger); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) @@ -79,7 +79,7 @@ void ScriptMgr::OnAddPassenger(Vehicle* veh, Unit* passenger, int8 seatId) void ScriptMgr::OnRemovePassenger(Vehicle* veh, Unit* passenger) { ASSERT(veh); - ASSERT(veh->GetBase()->GetTypeId() == TYPEID_UNIT); + ASSERT(veh->GetBase()->IsCreature()); ASSERT(passenger); if (auto tempScript = ScriptRegistry<VehicleScript>::GetScriptById(veh->GetBase()->ToCreature()->GetScriptId())) |