From 175424d3cb645f20cadd77c006081afaab066ad9 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 27 Sep 2025 23:25:37 +0200 Subject: Core/Misc: Reduce differences between branches --- src/server/game/Globals/ObjectMgr.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Globals/ObjectMgr.cpp') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 945084e9655..9afe36d596b 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5945,7 +5945,7 @@ void ObjectMgr::LoadSpellScriptNames() SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId); if (!spellInfo) { - TC_LOG_ERROR("sql.sql", "Scriptname: `{}` spell (Id: {}) does not exist.", scriptName, spellId); + TC_LOG_ERROR("sql.sql", "Scriptname: `{}` spell (Id: {}) does not exist.", scriptName, fields[0].GetInt32()); continue; } @@ -7791,7 +7791,7 @@ void ObjectMgr::LoadGameObjectTemplate() CheckGOLockId(&got, got.camera.lockId, 0); break; } - case GAMEOBJECT_TYPE_MO_TRANSPORT: //15 + case GAMEOBJECT_TYPE_MAP_OBJ_TRANSPORT: //15 { if (got.moTransport.taxiPathId) { @@ -7803,7 +7803,7 @@ void ObjectMgr::LoadGameObjectTemplate() _transportMaps.insert(transportMap); break; } - case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18 + case GAMEOBJECT_TYPE_RITUAL: //18 break; case GAMEOBJECT_TYPE_SPELLCASTER: //22 { -- cgit v1.2.3