diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 22 | ||||
| -rw-r--r-- | src/map/chrif.c | 12 |
2 files changed, 15 insertions, 19 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 36b3964aa..5ec823a61 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6693,21 +6693,18 @@ int atcommand_skilltree(const int fd, struct map_session_data* sd, const char* c } // Hand a ring with partners name on it to this char -void getring (struct map_session_data *sd) +void getring (struct map_session_data* sd) { - int flag,item_id = 0; + int flag, item_id; struct item item_tmp; - if(sd->status.sex==0) - item_id = 2635; - else - item_id = 2634; + item_id = (sd->status.sex) ? WEDDING_RING_M : WEDDING_RING_F; - memset(&item_tmp,0,sizeof(item_tmp)); - item_tmp.nameid=item_id; - item_tmp.identify=1; - item_tmp.card[0]=255; - item_tmp.card[2]=sd->status.partner_id; - item_tmp.card[3]=sd->status.partner_id >> 16; + memset(&item_tmp, 0, sizeof(item_tmp)); + item_tmp.nameid = item_id; + item_tmp.identify = 1; + item_tmp.card[0] = 255; + item_tmp.card[2] = sd->status.partner_id; + item_tmp.card[3] = sd->status.partner_id >> 16; //Logs (A)dmins items [Lupus] if(log_config.enable_logs&0x400) @@ -6717,7 +6714,6 @@ void getring (struct map_session_data *sd) clif_additem(sd,0,0,flag); map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,NULL,NULL,NULL,0); } - } /*========================================== diff --git a/src/map/chrif.c b/src/map/chrif.c index 770e232b5..d6f3dea04 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -655,7 +655,7 @@ int chrif_changesex(int id, int sex) * 4: unban * 5: changesex * type of answer: - * 0: login-server resquest done + * 0: login-server request done * 1: player not found * 2: gm level too low * 3: login-server offline @@ -679,7 +679,7 @@ int chrif_char_ask_name_answer(int fd) switch(RFIFOW(fd, 30)) { case 1: // block switch(RFIFOW(fd, 32)) { - case 0: // login-server resquest done + case 0: // login-server request done sprintf(output, "Login-server has been asked to block the player '%s'.", player_name); break; //case 1: // player not found @@ -693,7 +693,7 @@ int chrif_char_ask_name_answer(int fd) break; case 2: // ban switch(RFIFOW(fd, 32)) { - case 0: // login-server resquest done + case 0: // login-server request done sprintf(output, "Login-server has been asked to ban the player '%s'.", player_name); break; //case 1: // player not found @@ -707,7 +707,7 @@ int chrif_char_ask_name_answer(int fd) break; case 3: // unblock switch(RFIFOW(fd, 32)) { - case 0: // login-server resquest done + case 0: // login-server request done sprintf(output, "Login-server has been asked to unblock the player '%s'.", player_name); break; //case 1: // player not found @@ -721,7 +721,7 @@ int chrif_char_ask_name_answer(int fd) break; case 4: // unban switch(RFIFOW(fd, 32)) { - case 0: // login-server resquest done + case 0: // login-server request done sprintf(output, "Login-server has been asked to unban the player '%s'.", player_name); break; //case 1: // player not found @@ -735,7 +735,7 @@ int chrif_char_ask_name_answer(int fd) break; case 5: // changesex switch(RFIFOW(fd, 32)) { - case 0: // login-server resquest done + case 0: // login-server request done sprintf(output, "Login-server has been asked to change the sex of the player '%s'.", player_name); break; //case 1: // player not found |