josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Author: VladimirMangos

--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-19 18:49:11 -06:00
parent fe6bfc2ef1
commit 7fc442263d
5 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Corpse.h
-4
View File
@@ -82,10 +82,6 @@ class Corpse : public WorldObject
Player* lootRecipient;
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 Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
src/game/Creature.h
-4
View File
@@ -540,10 +540,6 @@ class TRINITY_DLL_SPEC Creature : public Unit
void addGossipOption(GossipOption const& gso) { m_goptions.push_back(gso); }
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 Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); }
src/game/DynamicObject.h
-4
View File
@@ -50,10 +50,6 @@ class DynamicObject : public WorldObject
void Delay(int32 delaytime);
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 Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
src/game/GameObject.h
-4
View File
@@ -444,10 +444,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
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 Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
src/game/Level1.cpp
+4 -4
View File
@@ -53,7 +53,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args)
return false;
}
pCreature->Say(args, LANG_UNIVERSAL, 0);
pCreature->MonsterSay(args, LANG_UNIVERSAL, 0);
return true;
}
@@ -71,7 +71,7 @@ bool ChatHandler::HandleNpcYellCommand(const char* args)
return false;
}
pCreature->Yell(args, LANG_UNIVERSAL, 0);
pCreature->MonsterYell(args, LANG_UNIVERSAL, 0);
return true;
}
@@ -91,7 +91,7 @@ bool ChatHandler::HandleNpcTextEmoteCommand(const char* args)
return false;
}
pCreature->TextEmote(args, 0);
pCreature->MonsterTextEmote(args, 0);
return true;
}
@@ -119,7 +119,7 @@ bool ChatHandler::HandleNpcWhisperCommand(const char* args)
if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0))
return false;
pCreature->Whisper(text,receiver_guid);
pCreature->MonsterWhisper(text,receiver_guid);
return true;
}