diff --git a/changelog.txt b/changelog.txt index 564954ec0..c4b7f040e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,9 +1,6 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- -== 02/16/2013 == -Derision: Added optional guildid to quest::gmsay, i.e. quest::gmsay(, [color], [toworld], [guildid]) - == 02/12/2013 == Kayen: AA fix diff --git a/zone/perlparser.cpp b/zone/perlparser.cpp index 54fecaab4..b6f2e6982 100644 --- a/zone/perlparser.cpp +++ b/zone/perlparser.cpp @@ -644,13 +644,12 @@ XS(XS__gmsay); XS(XS__gmsay) { dXSARGS; - if ((items < 1) || (items > 4)) + if (items != 1 && items != 2 && items != 3) Perl_croak(aTHX_ "Usage: gmsay(str, color, send_to_world?)"); char * str = (char *)SvPV_nolen(ST(0)); int color = 7; bool send_to_world = 0; - uint32 to_guilddbid = 0; if (items > 1) { color = (int)SvIV(ST(1)); @@ -660,11 +659,7 @@ XS(XS__gmsay) send_to_world = ((int)SvIV(ST(2))) == 0?false:true; } - if (items > 3) { - to_guilddbid = (int)SvIV(ST(3)); - } - - quest_manager.gmsay(str, color, send_to_world, to_guilddbid); + quest_manager.gmsay(str, color, send_to_world); XSRETURN_EMPTY; } diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp index e7cb7df85..1a3fda81e 100644 --- a/zone/questmgr.cpp +++ b/zone/questmgr.cpp @@ -526,12 +526,12 @@ void QuestManager::shout2(const char *str) { worldserver.SendEmoteMessage(0,0,0,13, "%s shouts, '%s'", owner->GetCleanName(), str); } -void QuestManager::gmsay(const char *str, uint32 color, bool send_to_world, uint32 to_guilddbid) { +void QuestManager::gmsay(const char *str, uint32 color, bool send_to_world) { if(send_to_world) { - worldserver.SendEmoteMessage(0, to_guilddbid, 80, color, "%s", str); + worldserver.SendEmoteMessage(0, 0, 80, color, "%s", str); } else { - entity_list.MessageStatus(to_guilddbid, 80, color, "%s", str); + entity_list.MessageStatus(0, 80, color, "%s", str); } } diff --git a/zone/questmgr.h b/zone/questmgr.h index 0c9be74fb..83c3a006e 100644 --- a/zone/questmgr.h +++ b/zone/questmgr.h @@ -68,7 +68,7 @@ public: void emote(const char *str); void shout(const char *str); void shout2(const char *str); - void gmsay(const char *str, uint32 color, bool send_to_world, uint32 to_guilddbid); + void gmsay(const char *str, uint32 color, bool send_to_world); void depop(int npc_type = 0); // depop NPC and don't start spawn timer void depop_withtimer(int npc_type = 0); // depop NPC and start spawn timer void depopall(int npc_type = 0);