mirror of
https://github.com/mangosfour/server.git
synced 2025-12-20 16:37:04 +00:00
Merge branch 'master' into 303
Conflicts: src/game/WorldSocket.cpp src/shared/Database/DBCStructure.h src/shared/Database/DBCfmt.cpp
This commit is contained in:
commit
6fae544fbe
23 changed files with 280 additions and 118 deletions
|
|
@ -449,6 +449,9 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
|
|||
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
|
||||
void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId,receiver); }
|
||||
|
||||
// overwrite WorldObject function for proper name localization
|
||||
const char* GetNameForLocaleIdx(int32 locale_idx) const;
|
||||
|
||||
void SaveToDB();
|
||||
void SaveToDB(uint32 mapid, uint8 spawnMask);
|
||||
bool LoadFromDB(uint32 guid, Map *map);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue