From 32d659fee7178b889ee98447a68e5d96732cee29 Mon Sep 17 00:00:00 2001
From: Cydh Ramdh <house.bad@gmail.com>
Date: Mon, 16 Jun 2014 11:22:04 +0700
Subject: [PATCH] Follow up 267d521, thank Napster (bugreport:9040)

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
---
 src/map/clif.c | 1 -
 src/map/log.c  | 6 +++---
 src/map/log.h  | 2 +-
 src/map/pc.c   | 7 ++++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index 84d1e28efb..25b201f7c2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11089,7 +11089,6 @@ void clif_parse_StopAttack(int fd,struct map_session_data *sd)
 void clif_parse_PutItemToCart(int fd,struct map_session_data *sd)
 {
 	struct s_packet_db* info = &packet_db[sd->packet_ver][RFIFOW(fd,0)];
-	short flag = 0;
 	if (pc_istrading(sd))
 		return;
 	if (!pc_iscarton(sd))
diff --git a/src/map/log.c b/src/map/log.c
index fcc1866b2c..a5633e8582 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -285,7 +285,7 @@ void log_zeny(struct map_session_data* sd, e_log_pick_type type, struct map_sess
 
 
 /// logs MVP monster rewards
-void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
+void log_mvpdrop(struct map_session_data* sd, int monster_id, unsigned short* log_mvp)
 {
 	nullpo_retv(sd);
 
@@ -297,11 +297,11 @@ void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp)
 #ifdef BETA_THREAD_TEST
 		char entry[512];
 		int e_length = 0;
-		e_length = sprintf(entry,  LOG_QUERY " INTO `%s` (`mvp_date`, `kill_char_id`, `monster_id`, `prize`, `mvpexp`, `map`) VALUES (NOW(), '%d', '%d', '%hu', '%d', '%s') ",
+		e_length = sprintf(entry,  LOG_QUERY " INTO `%s` (`mvp_date`, `kill_char_id`, `monster_id`, `prize`, `mvpexp`, `map`) VALUES (NOW(), '%d', '%d', '%hu', '%hu', '%s') ",
 						   log_config.log_mvpdrop, sd->status.char_id, monster_id, log_mvp[0], log_mvp[1], mapindex_id2name(sd->mapindex));
 		queryThread_log(entry,e_length);
 #else
-		if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`mvp_date`, `kill_char_id`, `monster_id`, `prize`, `mvpexp`, `map`) VALUES (NOW(), '%d', '%d', '%hu', '%d', '%s') ",
+		if( SQL_ERROR == Sql_Query(logmysql_handle, LOG_QUERY " INTO `%s` (`mvp_date`, `kill_char_id`, `monster_id`, `prize`, `mvpexp`, `map`) VALUES (NOW(), '%d', '%d', '%hu', '%hu', '%s') ",
 			log_config.log_mvpdrop, sd->status.char_id, monster_id, log_mvp[0], log_mvp[1], mapindex_id2name(sd->mapindex)) )
 		{
 			Sql_ShowDebug(logmysql_handle);
diff --git a/src/map/log.h b/src/map/log.h
index 35bc4ad0ce..62cdbffbe0 100644
--- a/src/map/log.h
+++ b/src/map/log.h
@@ -69,7 +69,7 @@ void log_atcommand(struct map_session_data* sd, const char* message);
 
 /// old, but useful logs
 void log_branch(struct map_session_data* sd);
-void log_mvpdrop(struct map_session_data* sd, int monster_id, int* log_mvp);
+void log_mvpdrop(struct map_session_data* sd, int monster_id, unsigned short* log_mvp);
 
 int log_config_read(const char* cfgName);
 
diff --git a/src/map/pc.c b/src/map/pc.c
index cf7f6a86f7..a69cd0073b 100755
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4953,13 +4953,14 @@ void pc_getitemfromcart(struct map_session_data *sd,int idx,int amount)
 
 	item_data=&sd->status.cart[idx];
 
-	if(item_data->nameid==0 || amount < 1 || item_data->amount<amount || sd->state.vending )
+	if(item_data->nameid == 0 || amount < 1 || item_data->amount<amount || sd->state.vending )
 		return;
 	if((flag = pc_additem(sd,item_data,amount,LOG_TYPE_NONE)) == 0)
 		pc_cart_delitem(sd,idx,amount,0,LOG_TYPE_NONE);
-	else
+	else {
 		clif_dropitem(sd,idx,0);
-	clif_additem(sd,0,0,flag);
+		clif_additem(sd,0,0,flag);
+	}
 }
 
 /*==========================================