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

Drop Say/Yell/etc string versions.

Browse source 
1) DB based string_id versions must be used.
2) for debug purposes raw WorldObject::MonsterSay/etc versions can be used
This commit is contained in:
VladimirMangos 2009-02-19 11:57:05 +03:00
parent 1206026b44
commit bf5e1908d6
6 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bindings/universal/ScriptMgr.h
View file

@ -136,9 +136,9 @@ struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI
m_creature->CastSpell(who,spellInfo,true); m_creature->CastSpell(who,spellInfo,true);
} }
void DoSay(char const* text, uint32 language) void DoSay(int32 text_id, uint32 language)
{ {
m_creature->Say(text,language,0); m_creature->Say(text_id,language,0);
} }
void DoGoHome(); void DoGoHome();

4
src/game/Corpse.h
View file

@ -80,10 +80,6 @@ class Corpse : public WorldObject
Player* lootRecipient; Player* lootRecipient;
bool lootForBody; bool lootForBody;
void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); }
void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); }
void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); }
void Whisper(const char* text, uint64 receiver) { MonsterWhisper(text,receiver); }
void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }

4
src/game/Creature.h
View file

@ -522,10 +522,6 @@ class MANGOS_DLL_SPEC Creature : public Unit
void addGossipOption(GossipOption const& gso) { m_goptions.push_back(gso); } void addGossipOption(GossipOption const& gso) { m_goptions.push_back(gso); }
void setEmoteState(uint8 emote) { m_emoteState = emote; }; void setEmoteState(uint8 emote) { m_emoteState = emote; };
void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); }
void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); }
void TextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(text,TargetGuid,IsBossEmote); }
void Whisper(const char* text, uint64 receiver, bool IsBossWhisper = false) { MonsterWhisper(text,receiver,IsBossWhisper); }
void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); } void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); }

4
src/game/DynamicObject.h
View file

@ -48,10 +48,6 @@ class DynamicObject : public WorldObject
void Delay(int32 delaytime); void Delay(int32 delaytime);
bool isVisibleForInState(Player const* u, bool inVisibleList) const; bool isVisibleForInState(Player const* u, bool inVisibleList) const;
void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); }
void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); }
void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); }
void Whisper(const char* text, uint64 receiver) { MonsterWhisper(text,receiver); }
void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }

4
src/game/GameObject.h
View file

@ -441,10 +441,6 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; } uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; }
void Say(const char* text, uint32 language, uint64 TargetGuid) { MonsterSay(text,language,TargetGuid); }
void Yell(const char* text, uint32 language, uint64 TargetGuid) { MonsterYell(text,language,TargetGuid); }
void TextEmote(const char* text, uint64 TargetGuid) { MonsterTextEmote(text,TargetGuid); }
void Whisper(const char* text,uint64 receiver) { MonsterWhisper(text,receiver); }
void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); } void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); } void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); } void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }

8
src/game/Level1.cpp
View file

@ -49,7 +49,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args)
return false; return false;
} }
pCreature->Say(args, LANG_UNIVERSAL, 0); pCreature->MonsterSay(args, LANG_UNIVERSAL, 0);
return true; return true;
} }
@ -67,7 +67,7 @@ bool ChatHandler::HandleNpcYellCommand(const char* args)
return false; return false;
} }
pCreature->Yell(args, LANG_UNIVERSAL, 0); pCreature->MonsterYell(args, LANG_UNIVERSAL, 0);
return true; return true;
} }
@ -87,7 +87,7 @@ bool ChatHandler::HandleNpcTextEmoteCommand(const char* args)
return false; return false;
} }
pCreature->TextEmote(args, 0); pCreature->MonsterTextEmote(args, 0);
return true; return true;
} }
@ -115,7 +115,7 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args)
if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0)) if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0))
return false; return false;
pCreature->Whisper(text,receiver_guid); pCreature->MonsterWhisper(text,receiver_guid);
return true; return true;
} }