Changed Kafrapoints calculation.

Kafrapoints should now be used correctly.
Issue #1540

Changed opening braces according to coding styl.
Changed some lines according to coding styl.
new-line-before-return ?

more styling code changes

changes in coding style

coding style changes

Fixed message output on acted cash.
Removed unsupported	and not needed var ret.

Update pc.c

Update atcommand.c

Coding style

added function description

added return validation

used wrong method in validation

Fixed typo in clif.c

Moved temp var to block start

3 files changed, 54 insertions, 41 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 2bcb22738..e529f8839 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7872,7 +7872,6 @@ ACMD(cash)
 {
 	char output[128];
 	int value;
-	int ret=0;
 
 	if (!*message || (value = atoi(message)) == 0) {
 		clif->message(fd, msg_fd(fd,1322)); // Please enter an amount.
@@ -7880,38 +7879,38 @@ ACMD(cash)
 	}
 
 	if (!strcmpi(info->command,"cash")) {
-		if( value > 0 ) {
-			if( (ret=pc->getcash(sd, value, 0)) >= 0){
+		if (value > 0) {
+			if ((pc->getcash(sd, value, 0)) >= 0) {
 				// If this option is set, the message is already sent by pc function
-				if( !battle_config.cashshop_show_points ){
-					sprintf(output, msg_fd(fd,505), ret, sd->cashPoints);
+				if (!battle_config.cashshop_show_points) {
+					sprintf(output, msg_fd(fd,505), value, sd->cashPoints);
 					clif_disp_onlyself(sd, output);
 					clif->message(fd, output);
 				}
 			} else
 				clif->message(fd, msg_fd(fd,149)); // Unable to decrease the number/value.
 		} else {
-			if( (ret=pc->paycash(sd, -value, 0)) >= 0){
-			    sprintf(output, msg_fd(fd,410), ret, sd->cashPoints);
+			if ((pc->paycash(sd, -value, 0)) >= 0) {
+			    sprintf(output, msg_fd(fd,410), -value, sd->cashPoints);
 				clif_disp_onlyself(sd, output);
 				clif->message(fd, output);
 			} else
 				clif->message(fd, msg_fd(fd,41)); // Unable to decrease the number/value.
 		}
 	} else { // @points
-		if( value > 0 ) {
-			if( (ret=pc->getcash(sd, 0, value)) >= 0) {
+		if (value > 0) {
+			if ((pc->getcash(sd, 0, value)) >= 0) {
 				// If this option is set, the message is already sent by pc function
-				if( !battle_config.cashshop_show_points ){
-					sprintf(output, msg_fd(fd,506), ret, sd->kafraPoints);
+				if (!battle_config.cashshop_show_points) {
+					sprintf(output, msg_fd(fd,506), value, sd->kafraPoints);
 					clif_disp_onlyself(sd, output);
 					clif->message(fd, output);
 				}
 			} else
 				clif->message(fd, msg_fd(fd,149)); // Unable to decrease the number/value.
 		} else {
-			if( (ret=pc->paycash(sd, -value, -value)) >= 0){
-			    sprintf(output, msg_fd(fd,411), ret, sd->kafraPoints);
+			if ((pc->paycash(sd, -value, -value)) >= 0) {
+			    sprintf(output, msg_fd(fd,411), -value, sd->kafraPoints);
 				clif_disp_onlyself(sd, output);
 				clif->message(fd, output);
 			} else
diff --git a/src/map/clif.c b/src/map/clif.c
index 7c314b075..64e44dfff 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18010,31 +18010,37 @@ void clif_parse_CashShopBuy(int fd, struct map_session_data *sd) {
 		short tab = RFIFOW(fd, 18 + ( i * 10 ));
 		enum CASH_SHOP_BUY_RESULT result = CSBR_UNKNOWN;
 
-		if( tab < 0 || tab >= CASHSHOP_TAB_MAX )
+		if(tab < 0 || tab >= CASHSHOP_TAB_MAX)
 			continue;
 
-		for( j = 0; j < clif->cs.item_count[tab]; j++ ) {
+		for(j = 0; j < clif->cs.item_count[tab]; j++) {
 			if( clif->cs.data[tab][j]->id == id )
 				break;
 		}
-		if( j < clif->cs.item_count[tab] ) {
+		if(j < clif->cs.item_count[tab]) {
 			struct item_data *data;
-			if( sd->kafraPoints < kafra_pay ) {
+			if(sd->kafraPoints < kafra_pay) {
 				result = CSBR_SHORTTAGE_CASH;
-			} else if( (sd->cashPoints+kafra_pay) < (clif->cs.data[tab][j]->price * qty) ) {
+			} else if((sd->cashPoints+kafra_pay) < (clif->cs.data[tab][j]->price * qty)) {
 				result = CSBR_SHORTTAGE_CASH;
-			} else if ( !( data = itemdb->exists(clif->cs.data[tab][j]->id) ) ) {
+			} else if (!(data = itemdb->exists(clif->cs.data[tab][j]->id))) {
 				result = CSBR_UNKONWN_ITEM;
 			} else {
 				struct item item_tmp;
 				int k, get_count;
-
+				int ret = 0;
+				
 				get_count = qty;
 
 				if (!itemdb->isstackable2(data))
 					get_count = 1;
-
-				pc->paycash(sd, clif->cs.data[tab][j]->price * qty, kafra_pay);// [Ryuuzaki]
+				
+				ret = pc->paycash(sd, clif->cs.data[tab][j]->price * qty, kafra_pay);// [Ryuuzaki] //changed Kafrapoints calculation. [Normynator]
+				if (ret < 0) {
+					ShowError("clif_parse_CashShopBuy: The return from pc->paycash was negative which is not allowed.\n");
+					break; //This should never happen.
+				}
+				kafra_pay = ret;
 				for (k = 0; k < qty; k += get_count) {
 					if (!pet->create_egg(sd, data->nameid)) {
 						memset(&item_tmp, 0, sizeof(item_tmp));
diff --git a/src/map/pc.c b/src/map/pc.c
index 0b30b1221..cd4b2a54f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4448,46 +4448,54 @@ int pc_payzeny(struct map_session_data *sd,int zeny, enum e_log_pick_type type,
 
 	return 0;
 }
-/*==========================================
- * Cash Shop
- *------------------------------------------*/
 
+/**
+ * Calculates leftover cashpoints and kafrapoints when buying an item from cashshop
+ *
+ * @param price     Price of the item.
+ * @param points    Provided kafra points.
+ * 	
+ * @return points	Leftover kafra points.
+ */
+//Changed Kafrapoints calculation. [Normynator]
 int pc_paycash(struct map_session_data *sd, int price, int points)
 {
 	int cash;
-	nullpo_retr(-1,sd);
+	int mempoints;
+	nullpo_retr(-1, sd);
 
-	points = cap_value(points,-MAX_ZENY,MAX_ZENY); //prevent command UB
-	if( price < 0 || points < 0 )
-	{
+	points = cap_value(points, -MAX_ZENY, MAX_ZENY); //prevent command UB
+	if (price < 0 || points < 0) {
 		ShowError("pc_paycash: Paying negative points (price=%d, points=%d, account_id=%d, char_id=%d).\n", price, points, sd->status.account_id, sd->status.char_id);
 		return -2;
 	}
 
-	if( points > price )
-	{
+	if (points > price) {
 		ShowWarning("pc_paycash: More kafra points provided than needed (price=%d, points=%d, account_id=%d, char_id=%d).\n", price, points, sd->status.account_id, sd->status.char_id);
-		points = price;
+		points = points - price;
+		mempoints = price;
+		cash = 0;
+	} else {
+		cash = price - points;
+		mempoints = points;
+		points = 0;
 	}
 
-	cash = price-points;
-
-	if( sd->cashPoints < cash || sd->kafraPoints < points )
-	{
+	if (sd->cashPoints < cash || sd->kafraPoints < mempoints) {
 		ShowError("pc_paycash: Not enough points (cash=%d, kafra=%d) to cover the price (cash=%d, kafra=%d) (account_id=%d, char_id=%d).\n", sd->cashPoints, sd->kafraPoints, cash, points, sd->status.account_id, sd->status.char_id);
 		return -1;
 	}
 
-	pc_setaccountreg(sd, script->add_str("#CASHPOINTS"), sd->cashPoints-cash);
-	pc_setaccountreg(sd, script->add_str("#KAFRAPOINTS"), sd->kafraPoints-points);
+	pc_setaccountreg(sd, script->add_str("#CASHPOINTS"), sd->cashPoints - cash);
+	pc_setaccountreg(sd, script->add_str("#KAFRAPOINTS"), sd->kafraPoints - mempoints);
 
-	if( battle_config.cashshop_show_points )
-	{
+	if (battle_config.cashshop_show_points) {
 		char output[128];
 		sprintf(output, msg_sd(sd,504), points, cash, sd->kafraPoints, sd->cashPoints);
 		clif_disp_onlyself(sd, output);
 	}
-	return cash+points;
+	
+	return points;
 }
 
 int pc_getcash(struct map_session_data *sd, int cash, int points)