diff options
| author | MadCamel <madcamel@gmail.com> | 2009-08-09 15:42:51 -0400 |
|---|---|---|
| committer | MadCamel <madcamel@gmail.com> | 2009-08-09 15:42:51 -0400 |
| commit | be14846f81942b7965212d71446aa6ae91ee8dc7 (patch) | |
| tree | bfdea8348fb41ff01e6f0eb684892c7cdefe7c93 /src/map | |
| parent | b1f47a7d6d0e5b0842bbab61c20e47da140e8954 (diff) | |
| parent | 37bdc8e72ec43e6e8f827ed77a1f93f5a8b0007f (diff) | |
| download | tmwa-be14846f81942b7965212d71446aa6ae91ee8dc7.tar.gz tmwa-be14846f81942b7965212d71446aa6ae91ee8dc7.tar.bz2 tmwa-be14846f81942b7965212d71446aa6ae91ee8dc7.tar.xz tmwa-be14846f81942b7965212d71446aa6ae91ee8dc7.zip | |
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 2 | ||||
| -rw-r--r-- | src/map/magic-expr.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9357084..908e9ff 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6507,7 +6507,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < if (malformed || !magic_message(sd, buf, msg_len)) { tmw_CheckChatSpam(sd, RFIFOP(fd,4)); - if (malformed) { + if ((malformed)||(pc_isdead(sd))) { free(buf); return; } diff --git a/src/map/magic-expr.c b/src/map/magic-expr.c index 2f52be5..c136a17 100644 --- a/src/map/magic-expr.c +++ b/src/map/magic-expr.c @@ -954,9 +954,9 @@ fun_running_status_update(env_t *env, int args_nr, val_t *result, val_t *args) } static int -fun_is_gm_invisible(env_t *env, int args_nr, val_t *result, val_t *args) +fun_status_option(env_t *env, int args_nr, val_t *result, val_t *args) { - RESULTINT = ((((struct map_session_data *)ARGENTITY(0))->status.option & 4096) != 0); + RESULTINT = ((((struct map_session_data *)ARGENTITY(0))->status.option & ARGINT(0)) != 0); return 0; } @@ -1186,7 +1186,7 @@ static fun_t functions[] = { { "count_item", "e.", 'i', fun_count_item }, { "line_of_sight", "ll", 'i', fun_line_of_sight }, { "running_status_update", "ei", 'i', fun_running_status_update }, - { "is_gm_invisible", "e", 'i', fun_is_gm_invisible }, + { "status_option", "ei", 'i', fun_status_option }, { "element", "e", 'i', fun_element }, { "element_level", "e", 'i', fun_element_level }, { "has_shroud", "e", 'i', fun_has_shroud }, |