diff options
| author | shennetsind <ind@henn.et> | 2013-09-17 09:05:05 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-09-17 09:05:05 -0300 |
| commit | 2884b361c247a66c91188cfeb924e1794d58da55 (patch) | |
| tree | 27e320d09fe8672dd141e7878273170d8ce25e44 /src | |
| parent | 35c131c7ff945bff238e3e242e513b5fe42a0067 (diff) | |
| parent | e6a9f7cfdb5ee6d27c12d35f2ecf8317595317b6 (diff) | |
| download | hercules-2884b361c247a66c91188cfeb924e1794d58da55.tar.gz hercules-2884b361c247a66c91188cfeb924e1794d58da55.tar.bz2 hercules-2884b361c247a66c91188cfeb924e1794d58da55.tar.xz hercules-2884b361c247a66c91188cfeb924e1794d58da55.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/script.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c index 547d1e87e..7ac638848 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9170,7 +9170,7 @@ BUILDIN(announce) { if (fontColor) intif->broadcast2(mes, (int)strlen(mes)+1, strtol(fontColor, (char **)NULL, 0), fontType, fontSize, fontAlign, fontY); else - intif->broadcast(mes, (int)strlen(mes)+1, flag&(BC_SOURCE_MASK|BC_TARGET_MASK)); + intif->broadcast(mes, (int)strlen(mes)+1, flag&BC_COLOR_MASK); } return true; } @@ -9247,7 +9247,7 @@ BUILDIN(mapannounce) return true; iMap->foreachinmap(buildin_announce_sub, m, BL_PC, - mes, strlen(mes)+1, flag&(BC_SOURCE_MASK|BC_TARGET_MASK), fontColor, fontType, fontSize, fontAlign, fontY); + mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } /*========================================== @@ -9272,7 +9272,7 @@ BUILDIN(areaannounce) return true; iMap->foreachinarea(buildin_announce_sub, m, x0, y0, x1, y1, BL_PC, - mes, strlen(mes)+1, flag&(BC_SOURCE_MASK|BC_TARGET_MASK), fontColor, fontType, fontSize, fontAlign, fontY); + mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } @@ -16139,7 +16139,7 @@ BUILDIN(instance_announce) { for( i = 0; i < instances[instance_id].num_map; i++ ) iMap->foreachinmap(buildin_announce_sub, instances[instance_id].map[i], BL_PC, - mes, strlen(mes)+1, flag&(BC_SOURCE_MASK|BC_TARGET_MASK), fontColor, fontType, fontSize, fontAlign, fontY); + mes, strlen(mes)+1, flag&BC_COLOR_MASK, fontColor, fontType, fontSize, fontAlign, fontY); return true; } |