mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 04:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Fix] Correct incorrectly renamed GAMEOBJECT_TYPE

Browse source
This commit is contained in:
Antz 2018-03-28 08:46:09 +01:00 • committed by Antz
parent 6331b4e6aa
commit a1ff8281cb
6 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Object/GameObject.cpp
View file

@ -1627,7 +1627,7 @@ void GameObject::Use(Unit* user)
break; break;
} }
case GAMEOBJECT_CreatureTypeFlagsTAND: // 24 case GAMEOBJECT_TYPE_FLAGSTAND: // 24
{ {
if (user->GetTypeId() != TYPEID_PLAYER) if (user->GetTypeId() != TYPEID_PLAYER)
{ return; } { return; }

4
src/game/Object/GameObject.h
View file

@ -450,7 +450,7 @@ struct GameObjectInfo
case GAMEOBJECT_TYPE_GOOBER: return goober.lockId; case GAMEOBJECT_TYPE_GOOBER: return goober.lockId;
case GAMEOBJECT_TYPE_AREADAMAGE: return areadamage.lockId; case GAMEOBJECT_TYPE_AREADAMAGE: return areadamage.lockId;
case GAMEOBJECT_TYPE_CAMERA: return camera.lockId; case GAMEOBJECT_TYPE_CAMERA: return camera.lockId;
case GAMEOBJECT_CreatureTypeFlagsTAND: return flagstand.lockId; case GAMEOBJECT_TYPE_FLAGSTAND: return flagstand.lockId;
case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lockId; case GAMEOBJECT_TYPE_FISHINGHOLE: return fishinghole.lockId;
case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.lockId; case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.lockId;
default: return 0; default: return 0;
@ -465,7 +465,7 @@ struct GameObjectInfo
case GAMEOBJECT_TYPE_BUTTON: return button.noDamageImmune; case GAMEOBJECT_TYPE_BUTTON: return button.noDamageImmune;
case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.noDamageImmune; case GAMEOBJECT_TYPE_QUESTGIVER: return questgiver.noDamageImmune;
case GAMEOBJECT_TYPE_GOOBER: return goober.noDamageImmune; case GAMEOBJECT_TYPE_GOOBER: return goober.noDamageImmune;
case GAMEOBJECT_CreatureTypeFlagsTAND: return flagstand.noDamageImmune; case GAMEOBJECT_TYPE_FLAGSTAND: return flagstand.noDamageImmune;
case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.noDamageImmune; case GAMEOBJECT_TYPE_FLAGDROP: return flagdrop.noDamageImmune;
default: return true; default: return true;
} }

2
src/game/Object/ObjectMgr.cpp
View file

@ -6495,7 +6495,7 @@ void ObjectMgr::LoadGameobjectInfo()
CheckGOSpellId(goInfo, goInfo->spellcaster.spellId, 0); CheckGOSpellId(goInfo, goInfo->spellcaster.spellId, 0);
break; break;
} }
case GAMEOBJECT_CreatureTypeFlagsTAND: // 24 case GAMEOBJECT_TYPE_FLAGSTAND: // 24
{ {
if (goInfo->flagstand.lockId) if (goInfo->flagstand.lockId)
CheckGOLockId(goInfo, goInfo->flagstand.lockId, 0); CheckGOLockId(goInfo, goInfo->flagstand.lockId, 0);

2
src/game/Server/SharedDefines.h
View file

@ -1629,7 +1629,7 @@ enum GameobjectTypes
GAMEOBJECT_TYPE_GUARDPOST = 21, GAMEOBJECT_TYPE_GUARDPOST = 21,
GAMEOBJECT_TYPE_SPELLCASTER = 22, GAMEOBJECT_TYPE_SPELLCASTER = 22,
GAMEOBJECT_TYPE_MEETINGSTONE = 23, GAMEOBJECT_TYPE_MEETINGSTONE = 23,
GAMEOBJECT_CreatureTypeFlagsTAND = 24, GAMEOBJECT_TYPE_FLAGSTAND = 24,
GAMEOBJECT_TYPE_FISHINGHOLE = 25, GAMEOBJECT_TYPE_FISHINGHOLE = 25,
GAMEOBJECT_TYPE_FLAGDROP = 26, GAMEOBJECT_TYPE_FLAGDROP = 26,
GAMEOBJECT_TYPE_MINI_GAME = 27, GAMEOBJECT_TYPE_MINI_GAME = 27,

2
src/game/WorldHandlers/SpellEffects.cpp
View file

@ -5228,7 +5228,7 @@ void Spell::EffectOpenLock(SpellEffectEntry const* effect)
return; return;
} }
} }
else if (goInfo->type == GAMEOBJECT_CreatureTypeFlagsTAND) else if (goInfo->type == GAMEOBJECT_TYPE_FLAGSTAND)
{ {
// CanUseBattleGroundObject() already called in CheckCast() // CanUseBattleGroundObject() already called in CheckCast()
// in battleground check // in battleground check