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

Merge commit 'origin/master' into 310

Browse source 
Conflicts:
	src/game/Player.cpp
This commit is contained in:
tomrus88 2009-05-06 09:40:35 +04:00
commit 6821c24268
27 changed files with 414 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/ObjectMgr.h
View file

@ -95,6 +95,15 @@ extern ScriptMapMap sSpellScripts;
extern ScriptMapMap sGameObjectScripts;
extern ScriptMapMap sEventScripts;
struct SpellClickInfo
{
uint32 spellId;
uint32 questId;
uint8 castFlags;
};
typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoMap;
struct AreaTrigger
{
uint8 requiredLevel;
@ -533,6 +542,9 @@ class ObjectMgr
void LoadReputationOnKill();
void LoadPointsOfInterest();
SpellClickInfoMap mSpellClickInfoMap;
void LoadNPCSpellClickSpells();
void LoadWeatherZoneChances();
void LoadGameTele();