pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 13:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_OP_SpecialMesg

Browse Source
This commit is contained in:
Michael Cook (mackal) 2019-07-20 01:27:37 -04:00 committed by GitHub
commit f4310c5a06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/lua_mob.cpp
View File

@ -753,6 +753,11 @@ void Lua_Mob::Say(const char *message) {
self->Say(message); self->Say(message);
} }
void Lua_Mob::Say(const char* message, int language) {
Lua_Safe_Call_Void();
entity_list.ChannelMessage(self, ChatChannel_Say, language, message); // these run through the client channels and probably shouldn't for NPCs, but oh well
}
void Lua_Mob::QuestSay(Lua_Client client, const char *message) { void Lua_Mob::QuestSay(Lua_Client client, const char *message) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
Journal::Options journal_opts; Journal::Options journal_opts;
@ -821,6 +826,11 @@ void Lua_Mob::Shout(const char *message) {
self->Shout(message); self->Shout(message);
} }
void Lua_Mob::Shout(const char* message, int language) {
Lua_Safe_Call_Void();
entity_list.ChannelMessage(self, ChatChannel_Shout, language, message);
}
void Lua_Mob::Emote(const char *message) { void Lua_Mob::Emote(const char *message) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
self->Emote(message); self->Emote(message);
@ -2377,10 +2387,12 @@ luabind::scope lua_register_mob() {
.def("GetSize", &Lua_Mob::GetSize) .def("GetSize", &Lua_Mob::GetSize)
.def("Message", &Lua_Mob::Message) .def("Message", &Lua_Mob::Message)
.def("Message_StringID", &Lua_Mob::Message_StringID) .def("Message_StringID", &Lua_Mob::Message_StringID)
.def("Say", &Lua_Mob::Say) .def("Say", (void(Lua_Mob::*)(const char*))& Lua_Mob::Say)
.def("Say", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Say)
.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *))&Lua_Mob::QuestSay) .def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *))&Lua_Mob::QuestSay)
.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *,luabind::adl::object))&Lua_Mob::QuestSay) .def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *,luabind::adl::object))&Lua_Mob::QuestSay)
.def("Shout", &Lua_Mob::Shout) .def("Shout", (void(Lua_Mob::*)(const char*))& Lua_Mob::Shout)
.def("Shout", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Shout)
.def("Emote", &Lua_Mob::Emote) .def("Emote", &Lua_Mob::Emote)
.def("InterruptSpell", (void(Lua_Mob::*)(void))&Lua_Mob::InterruptSpell) .def("InterruptSpell", (void(Lua_Mob::*)(void))&Lua_Mob::InterruptSpell)
.def("InterruptSpell", (void(Lua_Mob::*)(int))&Lua_Mob::InterruptSpell) .def("InterruptSpell", (void(Lua_Mob::*)(int))&Lua_Mob::InterruptSpell)

2
zone/lua_mob.h
View File

@ -168,9 +168,11 @@ public:
void Message(int type, const char *message); void Message(int type, const char *message);
void Message_StringID(int type, int string_id, uint32 distance); void Message_StringID(int type, int string_id, uint32 distance);
void Say(const char *message); void Say(const char *message);
void Say(const char* message, int language);
void QuestSay(Lua_Client client, const char *message); void QuestSay(Lua_Client client, const char *message);
void QuestSay(Lua_Client client, const char *message, luabind::adl::object opts); void QuestSay(Lua_Client client, const char *message, luabind::adl::object opts);
void Shout(const char *message); void Shout(const char *message);
void Shout(const char* message, int language);
void Emote(const char *message); void Emote(const char *message);
void InterruptSpell(); void InterruptSpell();
void InterruptSpell(int spell_id); void InterruptSpell(int spell_id);