diff options
| author | Haru <haru@dotalux.com> | 2013-09-11 01:28:31 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-11 02:26:04 +0200 |
| commit | eb10f355f7e228b59011326a7f84da2e593affea (patch) | |
| tree | 52c448eeef67c66794e6f8fccee3bfc446893ff3 /src/map/clif.h | |
| parent | c1c3ef1e0b356aaa89d8fba6d63b86130e8aae9c (diff) | |
| download | hercules-eb10f355f7e228b59011326a7f84da2e593affea.tar.gz hercules-eb10f355f7e228b59011326a7f84da2e593affea.tar.bz2 hercules-eb10f355f7e228b59011326a7f84da2e593affea.tar.xz hercules-eb10f355f7e228b59011326a7f84da2e593affea.zip | |
Fixed announce script command support for bc_blue and bc_woe
- Fixes an issue where it wasn't possible to use bc_blue or bc_woe at
the same time as bc_map, bc_area or bc_self.
(this partly works around bugreport:7693 -
http://hercules.ws/board/tracker/issue-7693-character-with-name )
- Replaced bc_* related values from various places through the sources
with constants.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index f414ecebb..73d3611a2 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -60,13 +60,13 @@ enum {// packet DB typedef enum send_target { ALL_CLIENT, ALL_SAMEMAP, - AREA, // area - AREA_WOS, // area, without self - AREA_WOC, // area, without chatrooms - AREA_WOSC, // area, without own chatroom - AREA_CHAT_WOC, // hearable area, without chatrooms - CHAT, // current chatroom - CHAT_WOS, // current chatroom, without self + AREA, // area + AREA_WOS, // area, without self + AREA_WOC, // area, without chatrooms + AREA_WOSC, // area, without own chatroom + AREA_CHAT_WOC, // hearable area, without chatrooms + CHAT, // current chatroom + CHAT_WOS, // current chatroom, without self PARTY, PARTY_WOS, PARTY_SAMEMAP, @@ -84,7 +84,7 @@ typedef enum send_target { DUEL_WOS, SELF, - BG, // BattleGround System + BG, // BattleGround System BG_WOS, BG_SAMEMAP, BG_SAMEMAP_WOS, @@ -94,6 +94,25 @@ typedef enum send_target { BG_QUEUE, } send_target; +typedef enum broadcast_flags { + BC_ALL = 0, + BC_MAP = 1, + BC_AREA = 2, + BC_SELF = 3, + BC_TARGET_MASK = 0x07, + + BC_PC = 0x00, + BC_NPC = 0x08, + BC_SOURCE_MASK = 0x08, // BC_PC|BC_NPC + + BC_YELLOW = 0x00, + BC_BLUE = 0x10, + BC_WOE = 0x20, + BC_COLOR_MASK = 0x30, // BC_YELLOW|BC_BLUE|BC_WOE + + BC_DEFAULT = BC_ALL|BC_PC|BC_YELLOW +} broadcast_flags; + typedef enum emotion_type { E_GASP = 0, // /! E_WHAT, // /? |