diff --git a/src/map/clif.cpp b/src/map/clif.cpp index ef936c0eb9..d3b994dc4b 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -19674,7 +19674,7 @@ void clif_parse_merge_item_cancel(int fd, struct map_session_data* sd) { * type: ITEMOBTAIN_TYPE_BOXITEM & ITEMOBTAIN_TYPE_MONSTER_ITEM "[playername] ... [sourcename] ... [itemname]" -> MsgStringTable[1629] * type: ITEMOBTAIN_TYPE_NPC "[playername] ... [itemname]" -> MsgStringTable[1870] **/ -void clif_broadcast_obtain_special_item(const char *char_name, unsigned short nameid, unsigned short container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type, const char *srcname) { +void clif_broadcast_obtain_special_item(const char *char_name, unsigned short nameid, unsigned short container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type) { unsigned char buf[9 + NAME_LENGTH * 2]; unsigned short cmd = 0; struct s_packet_db *info = NULL; diff --git a/src/map/clif.hpp b/src/map/clif.hpp index 2cd751589e..f5c69d6b42 100644 --- a/src/map/clif.hpp +++ b/src/map/clif.hpp @@ -1064,7 +1064,7 @@ void clif_notify_bindOnEquip(struct map_session_data *sd, int n); void clif_merge_item_open(struct map_session_data *sd); -void clif_broadcast_obtain_special_item(const char *char_name, unsigned short nameid, unsigned short container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type, const char *srcname); +void clif_broadcast_obtain_special_item(const char *char_name, unsigned short nameid, unsigned short container, enum BROADCASTING_SPECIAL_ITEM_OBTAIN type); void clif_dressing_room(struct map_session_data *sd, int flag); void clif_navigateTo(struct map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id ); diff --git a/src/map/intif.cpp b/src/map/intif.cpp index 6805bf73e1..a7e8566aa8 100644 --- a/src/map/intif.cpp +++ b/src/map/intif.cpp @@ -3222,12 +3222,12 @@ int intif_broadcast_obtain_special_item(struct map_session_data *sd, unsigned sh // Should not be here! if (type == ITEMOBTAIN_TYPE_NPC) { - intif_broadcast_obtain_special_item_npc(sd, nameid, NULL /*wisp_server_name*/); + intif_broadcast_obtain_special_item_npc(sd, nameid); return 0; } // Send local - clif_broadcast_obtain_special_item(sd->status.name, nameid, sourceid, (enum BROADCASTING_SPECIAL_ITEM_OBTAIN)type, NULL); + clif_broadcast_obtain_special_item(sd->status.name, nameid, sourceid, (enum BROADCASTING_SPECIAL_ITEM_OBTAIN)type); if (CheckForCharServer()) return 0; @@ -3256,11 +3256,11 @@ int intif_broadcast_obtain_special_item(struct map_session_data *sd, unsigned sh * @param srcname Source name * @return **/ -int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigned short nameid, const char *srcname) { +int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigned short nameid) { nullpo_retr(0, sd); // Send local - clif_broadcast_obtain_special_item(sd->status.name, nameid, 0, ITEMOBTAIN_TYPE_NPC, srcname); + clif_broadcast_obtain_special_item(sd->status.name, nameid, 0, ITEMOBTAIN_TYPE_NPC); if (CheckForCharServer()) return 0; @@ -3275,7 +3275,6 @@ int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigne WFIFOW(inter_fd, 6) = 0; WFIFOB(inter_fd, 8) = ITEMOBTAIN_TYPE_NPC; safestrncpy(WFIFOCP(inter_fd, 9), sd->status.name, NAME_LENGTH); - safestrncpy(WFIFOCP(inter_fd, 9 + NAME_LENGTH), srcname, NAME_LENGTH); WFIFOSET(inter_fd, WFIFOW(inter_fd, 2)); return 1; @@ -3288,13 +3287,13 @@ int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigne **/ void intif_parse_broadcast_obtain_special_item(int fd) { int type = RFIFOB(fd, 8); - char name[NAME_LENGTH], srcname[NAME_LENGTH]; + char name[NAME_LENGTH]; safestrncpy(name, RFIFOCP(fd, 9), NAME_LENGTH); if (type == ITEMOBTAIN_TYPE_NPC) safestrncpy(name, RFIFOCP(fd, 9 + NAME_LENGTH), NAME_LENGTH); - clif_broadcast_obtain_special_item(name, RFIFOW(fd, 4), RFIFOW(fd, 6), (enum BROADCASTING_SPECIAL_ITEM_OBTAIN)type, srcname); + clif_broadcast_obtain_special_item(name, RFIFOW(fd, 4), RFIFOW(fd, 6), (enum BROADCASTING_SPECIAL_ITEM_OBTAIN)type); } /*========================================== diff --git a/src/map/intif.hpp b/src/map/intif.hpp index ab1e4c8c41..e0768c8c2f 100644 --- a/src/map/intif.hpp +++ b/src/map/intif.hpp @@ -24,7 +24,7 @@ int intif_parse(int fd); int intif_broadcast(const char* mes, int len, int type); int intif_broadcast2(const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY); int intif_broadcast_obtain_special_item(struct map_session_data *sd, unsigned short nameid, unsigned int sourceid, unsigned char type); -int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigned short nameid, const char *srcname); +int intif_broadcast_obtain_special_item_npc(struct map_session_data *sd, unsigned short nameid); int intif_main_message(struct map_session_data* sd, const char* message); int intif_wis_message(struct map_session_data *sd,char *nick,char *mes,int mes_len);