diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-10 04:51:03 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-10 04:51:03 +0000 |
| commit | 7726e501b5156319a2940601ea1ef3ccfd7326fc (patch) | |
| tree | ff7cd83adc3158b854facd736f88ea6c9d4cfaa7 /src/map/clif.h | |
| parent | a4a5d536b46215d8040b6ef40f4b5f5141e5b299 (diff) | |
| download | hercules-7726e501b5156319a2940601ea1ef3ccfd7326fc.tar.gz hercules-7726e501b5156319a2940601ea1ef3ccfd7326fc.tar.bz2 hercules-7726e501b5156319a2940601ea1ef3ccfd7326fc.tar.xz hercules-7726e501b5156319a2940601ea1ef3ccfd7326fc.zip | |
Fixed bugreport:6876 / Reverting r16891
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16896 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.h')
| -rw-r--r-- | src/map/clif.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/clif.h b/src/map/clif.h index 6808810c1..4e780f66d 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -373,6 +373,7 @@ void clif_misceffect(struct block_list* bl,int type); // area void clif_changeoption(struct block_list* bl); // area void clif_changeoption2(struct block_list* bl); // area void clif_useitemack(struct map_session_data *sd,int index,int amount,bool ok); // self +void clif_GlobalMessage(struct block_list* bl, const char* message); void clif_createchat(struct map_session_data* sd, int flag); // self void clif_dispchat(struct chat_data* cd, int fd); // area or fd void clif_joinchatfail(struct map_session_data *sd,int flag); // self @@ -568,11 +569,11 @@ void clif_instance_leave(int fd); void clif_font(struct map_session_data *sd); // atcommand -void clif_notify_chat(struct block_list* bl, const char* message, send_target target); void clif_displaymessage(const int fd, const char* mes); void clif_disp_onlyself(struct map_session_data *sd, const char *mes, int len); void clif_disp_message(struct block_list* src, const char* mes, int len, enum send_target target); void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, enum send_target target); +void clif_MainChatMessage(const char* message); void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target); void clif_heal(int fd,int type,int val); void clif_resurrection(struct block_list *bl,int type); @@ -603,6 +604,7 @@ void clif_weather(int m); // [Valaris] void clif_specialeffect(struct block_list* bl, int type, enum send_target target); // special effects [Valaris] void clif_specialeffect_single(struct block_list* bl, int type, int fd); void clif_messagecolor(struct block_list* bl, unsigned long color, const char* msg); // Mob/Npc color talk [SnakeDrak] +void clif_message(struct block_list* bl, const char* msg); void clif_specialeffect_value(struct block_list* bl, int effect_id, int num, send_target target); void clif_GM_kickack(struct map_session_data *sd, int id); @@ -767,8 +769,4 @@ int clif_colormes(struct map_session_data * sd, enum clif_colors color, const ch #define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0; -#define clif_GlobalMessage(bl,message) clif_notify_chat(bl, message, ALL_CLIENT) -#define clif_MainChatMessage(message) clif_notify_chat(NULL, message, CHAT_MAINCHAT) -#define clif_message(bl,msg) clif_notify_chat(bl, msg, AREA_CHAT_WOC) - #endif /* _CLIF_H_ */ |