From acdde91ef9675a44ecd9a02d7f543814a75f0093 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 24 Jun 2017 09:12:37 -0400 Subject: allow channelmes to be called without attached rid --- src/map/script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index 5bdda8512..ea8b03450 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -23039,7 +23039,7 @@ BUILDIN(shopcount) */ BUILDIN(channelmes) { - struct map_session_data *sd = script->rid2sd(st); + struct map_session_data *sd = map->id2sd(st->rid); const char *channelname = script_getstr(st, 2); struct channel_data *chan = channel->search(channelname, sd); -- cgit v1.2.3-60-g2f50 From d382ab002074b76315bc9980bd8550fb778f51fb Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 24 Jun 2017 09:13:50 -0400 Subject: allow addchannelhandler to be called with attached rid --- src/map/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index ea8b03450..e0bdecd47 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -23057,9 +23057,10 @@ BUILDIN(channelmes) BUILDIN(addchannelhandler) { int i; + struct map_session_data *sd = map->id2sd(st->rid); const char *channelname = script_getstr(st, 2); const char *eventname = script_getstr(st, 3); - struct channel_data *chan = channel->search(channelname, NULL); + struct channel_data *chan = channel->search(channelname, sd); if (!chan) { script_pushint(st, 0); -- cgit v1.2.3-60-g2f50 From b21dd603acb3f77f941db8457a544ebc62658569 Mon Sep 17 00:00:00 2001 From: gumi Date: Sat, 24 Jun 2017 09:14:23 -0400 Subject: allow removechannelhandler to be called with attached rid --- src/map/script.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/map/script.c') diff --git a/src/map/script.c b/src/map/script.c index e0bdecd47..4150d3adb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -23083,9 +23083,10 @@ BUILDIN(addchannelhandler) BUILDIN(removechannelhandler) { int i; + struct map_session_data *sd = map->id2sd(st->rid); const char *channelname = script_getstr(st, 2); const char *eventname = script_getstr(st, 3); - struct channel_data *chan = channel->search(channelname, NULL); + struct channel_data *chan = channel->search(channelname, sd); if (!chan) { script_pushint(st, 0); -- cgit v1.2.3-60-g2f50