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

[9200] Move handling of most GO's from SendLoot() to GameObject::Use()

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2010-01-17 11:44:36 +01:00
parent 07a5c698ca
commit 95f9ec5fb2
3 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/GameObject.cpp
View file

@ -952,7 +952,14 @@ void GameObject::Use(Unit* user)
player->SetStandState(UNIT_STAND_STATE_SIT_LOW_CHAIR+info->chair.height); player->SetStandState(UNIT_STAND_STATE_SIT_LOW_CHAIR+info->chair.height);
return; return;
} }
//big gun, its a spell/aura case GAMEOBJECT_TYPE_SPELL_FOCUS:
{
// triggering linked GO
if (uint32 trapEntry = GetGOInfo()->goober.linkedTrapId)
TriggeringLinkedGameObject(trapEntry, user);
break;
}
case GAMEOBJECT_TYPE_GOOBER: //10 case GAMEOBJECT_TYPE_GOOBER: //10
{ {
GameObjectInfo const* info = GetGOInfo(); GameObjectInfo const* info = GetGOInfo();

14
src/game/SpellEffects.cpp
View file

@ -3105,22 +3105,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
{ {
case GAMEOBJECT_TYPE_DOOR: case GAMEOBJECT_TYPE_DOOR:
case GAMEOBJECT_TYPE_BUTTON: case GAMEOBJECT_TYPE_BUTTON:
gameObjTarget->UseDoorOrButton();
player->GetMap()->ScriptsStart(sGameObjectScripts, gameObjTarget->GetDBTableGUIDLow(), player, gameObjTarget);
return;
case GAMEOBJECT_TYPE_QUESTGIVER: case GAMEOBJECT_TYPE_QUESTGIVER:
// start or end quest
player->PrepareQuestMenu(guid);
player->SendPreparedQuest(guid);
return;
case GAMEOBJECT_TYPE_SPELL_FOCUS: case GAMEOBJECT_TYPE_SPELL_FOCUS:
// triggering linked GO
if (uint32 trapEntry = gameObjTarget->GetGOInfo()->spellFocus.linkedTrapId)
gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
return;
case GAMEOBJECT_TYPE_GOOBER: case GAMEOBJECT_TYPE_GOOBER:
gameObjTarget->Use(m_caster); gameObjTarget->Use(m_caster);
return; return;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9199" #define REVISION_NR "9200"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__