diff options
| -rw-r--r-- | src/char/char.c | 2 | ||||
| -rw-r--r-- | src/map/chrif.c | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 14 | ||||
| -rw-r--r-- | src/map/clif.h | 2 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 10 |
6 files changed, 15 insertions, 17 deletions
diff --git a/src/char/char.c b/src/char/char.c index e9cb95c94..f042c2d81 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -4560,7 +4560,7 @@ int do_init(int argc, char **argv) sql_config_read(SQL_CONF_NAME); if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { - ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); + ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n"); } diff --git a/src/map/chrif.c b/src/map/chrif.c index f3cc01fe1..7d11507a1 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -225,7 +225,7 @@ void chrif_setpasswd(char *pwd) void chrif_checkdefaultlogin(void) { if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) { - ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); + ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n"); ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n"); ShowNotice("and then edit your user/password in conf/map_athena.conf (or conf/import/map_conf.txt)\n"); } diff --git a/src/map/clif.c b/src/map/clif.c index b3bbb5a69..c9a8a685c 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5821,22 +5821,20 @@ void clif_item_repair_list(struct map_session_data *sd,struct map_session_data * /// Notifies the client about the result of a item repair request (ZC_ACK_ITEMREPAIR). /// 01fe <index>.W <result>.B -void clif_item_repaireffect(struct map_session_data *sd,int nameid,int flag) +void clif_item_repaireffect(struct map_session_data *sd,int idx,int flag) { - int view,fd; + int fd; nullpo_retv(sd); - fd=sd->fd; + + fd = sd->fd; WFIFOHEAD(fd,packet_len(0x1fe)); WFIFOW(fd, 0)=0x1fe; - // FIXME: this is inventory index - if((view = itemdb_viewid(nameid)) > 0) - WFIFOW(fd, 2)=view; - else - WFIFOW(fd, 2)=nameid; + WFIFOW(fd, 2)=idx+2; WFIFOB(fd, 4)=flag; WFIFOSET(fd,packet_len(0x1fe)); + } diff --git a/src/map/clif.h b/src/map/clif.h index 18b5f0031..b6993a46b 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -469,7 +469,7 @@ void clif_clearcart(int fd); void clif_item_identify_list(struct map_session_data *sd); void clif_item_identified(struct map_session_data *sd,int idx,int flag); void clif_item_repair_list(struct map_session_data *sd, struct map_session_data *dstsd); -void clif_item_repaireffect(struct map_session_data *sd, int nameid, int flag); +void clif_item_repaireffect(struct map_session_data *sd, int idx, int flag); void clif_item_damaged(struct map_session_data* sd, unsigned short position); void clif_item_refine_list(struct map_session_data *sd); diff --git a/src/map/map.c b/src/map/map.c index 765ec6086..da2826c26 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3904,7 +3904,7 @@ int do_init(int argc, char *argv[]) char ip_str[16]; ip2str(addr_[0], ip_str); - ShowError("Not all IP addresses in map_athena.conf configured, autodetecting...\n"); + ShowWarning("Not all IP addresses in map_athena.conf configured, autodetecting...\n"); if (naddr_ == 0) ShowError("Unable to determine your IP address...\n"); diff --git a/src/map/skill.c b/src/map/skill.c index d601bd8b8..8eab672c7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -13442,16 +13442,16 @@ void skill_repairweapon (struct map_session_data *sd, int idx) if(idx < 0 || idx >= MAX_INVENTORY) return; //Invalid index?? - item = &target_sd->status.inventory[idx]; + item = &target_sd->status.inventory[idx]; if(item->nameid <= 0 || item->attribute == 0) return; //Again invalid item.... if(sd!=target_sd && !battle_check_range(&sd->bl,&target_sd->bl,skill_get_range2(&sd->bl, sd->menuskill_id,pc_checkskill(sd, sd->menuskill_id)))){ - clif_item_repaireffect(sd,item->nameid,1); + clif_item_repaireffect(sd,idx,1); return; } - if (itemdb_type(item->nameid)==IT_WEAPON) + if ( sd->inventory_data[idx]->type == IT_WEAPON) material = materials [itemdb_wlv(item->nameid)-1]; // Lv1/2/3/4 weapons consume 1 Iron Ore/Iron/Steel/Rough Oridecon else material = materials [2]; // Armors consume 1 Steel @@ -13463,9 +13463,9 @@ void skill_repairweapon (struct map_session_data *sd, int idx) item->attribute=0; clif_equiplist(target_sd); pc_delitem(sd,pc_search_inventory(sd,material),1,0,0,LOG_TYPE_CONSUME); - clif_item_repaireffect(sd,item->nameid,0); + clif_item_repaireffect(sd,idx,0); if(sd!=target_sd) - clif_item_repaireffect(target_sd,item->nameid,0); + clif_item_repaireffect(target_sd,idx,0); } /*========================================== |