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

Derision's revert from svn I missed.

Browse Source
This commit is contained in:
KimLS 2013-02-16 16:25:57 -08:00
parent da7347f76f
commit b14519b1f5
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -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(<messsage>, [color], [toworld], [guildid])
== 02/12/2013 ==
Kayen: AA fix

9
zone/perlparser.cpp
View File

@ -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;
}

6
zone/questmgr.cpp
View File

@ -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);
}
}

2
zone/questmgr.h
View File

@ -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);