From 689a3ff9b3da25994e3c3dda4973191c458a9f19 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 3 Jul 2017 22:25:14 +0200 Subject: [PATCH] Added a few missing cashpoint message comments --- src/map/atcommand.c | 12 ++++++------ src/map/pc.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/map/atcommand.c b/src/map/atcommand.c index df3d32b915..b27e806244 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8426,18 +8426,18 @@ ACMD_FUNC(cash) if( (ret=pc_getcash(sd, value, 0, LOG_TYPE_COMMAND)) >= 0){ // If this option is set, the message is already sent by pc function if( !battle_config.cashshop_show_points ){ - sprintf(output, msg_txt(sd,505), ret, sd->cashPoints); + sprintf(output, msg_txt(sd,505), ret, sd->cashPoints); // Gained %d cash points. Total %d points. clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF); } } - else clif_displaymessage(fd, msg_txt(sd,149)); // Unable to decrease the number/value. + else clif_displaymessage(fd, msg_txt(sd,149)); // Impossible to increase the number/value. } else { if (-value > sd->cashPoints) //By command, if cash < value, force it to remove all value = -sd->cashPoints; if( (ret=pc_paycash(sd, -value, 0, LOG_TYPE_COMMAND)) >= 0){ // If this option is set, the message is already sent by pc function if( !battle_config.cashshop_show_points ){ - sprintf(output, msg_txt(sd,410), ret, sd->cashPoints); + sprintf(output, msg_txt(sd,410), ret, sd->cashPoints); // Removed %d cash points. Total %d points. clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF); } } @@ -8448,13 +8448,13 @@ ACMD_FUNC(cash) { // @points if( value > 0 ) { if( (ret=pc_getcash(sd, 0, value, LOG_TYPE_COMMAND)) >= 0){ - sprintf(output, msg_txt(sd,506), ret, sd->kafraPoints); + sprintf(output, msg_txt(sd,506), ret, sd->kafraPoints); // Gained %d kafra points. Total %d points. clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF); } - else clif_displaymessage(fd, msg_txt(sd,149)); // Unable to decrease the number/value. + else clif_displaymessage(fd, msg_txt(sd,149)); // Impossible to increase the number/value. } else { if( (ret=pc_paycash(sd, -value, -value, LOG_TYPE_COMMAND)) >= 0){ - sprintf(output, msg_txt(sd,411), ret, sd->kafraPoints); + sprintf(output, msg_txt(sd,411), ret, sd->kafraPoints); // Removed %d kafra points. Total %d points. clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF); } else clif_displaymessage(fd, msg_txt(sd,41)); // Unable to decrease the number/value. diff --git a/src/map/pc.c b/src/map/pc.c index ada75c31a7..a2df01a678 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4361,7 +4361,7 @@ int pc_paycash(struct map_session_data *sd, int price, int points, e_log_pick_ty { char output[CHAT_SIZE_MAX]; - sprintf(output, msg_txt(sd,504), points, cash, sd->kafraPoints, sd->cashPoints); + sprintf(output, msg_txt(sd,504), points, cash, sd->kafraPoints, sd->cashPoints); // Used %d kafra points and %d cash points. %d kafra and %d cash points remaining. clif_messagecolor(&sd->bl, color_table[COLOR_LIGHT_GREEN], output, false, SELF); } return cash+points;