Merge branch 'master' of https://github.com/HerculesWS/Hercules

4 files changed, 12 insertions, 5 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 63b47cfcf..e58fc9eef 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1278,6 +1278,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
 		StrBuf->Printf(&buf, ", `card%d`", j);
 	StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", cart_db, MAX_CART);
 
+	memset(&tmp_item, 0, sizeof(tmp_item));
 	if( SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
 	||	SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_INT, &char_id, 0)
 	||	SQL_ERROR == SQL->StmtExecute(stmt)
diff --git a/src/char/inter.c b/src/char/inter.c
index b213f1608..771b51602 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -341,8 +341,11 @@ const char* job_name(int class_) {
 		case JOB_OBORO:
 			return msg_txt(653 - JOB_KAGEROU+class_);
 
-		default:
+		case JOB_REBELLION:
 			return msg_txt(655);
+
+		default:
+			return msg_txt(656);
 	}
 }
 
diff --git a/src/map/mob.c b/src/map/mob.c
index 02c263bd3..16c33b552 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2447,7 +2447,6 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 	if(mvp_sd && md->db->mexp > 0 && !md->special_state.ai) {
 		int log_mvp[2] = {0};
 		unsigned int mexp;
-		struct item item;
 		double exp;
 
 		//mapflag: noexp check [Lorky]
@@ -2470,6 +2469,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type) {
 			/* pose them randomly in the list -- so on 100% drop servers it wont always drop the same item */
 			int mdrop_id[MAX_MVP_DROP];
 			int mdrop_p[MAX_MVP_DROP];
+			struct item item;
 
 			memset(&mdrop_id,0,MAX_MVP_DROP*sizeof(int));
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 84880c24d..feca11758 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4000,9 +4000,11 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount,e_l
 			return 4;
 
 		memcpy(&sd->status.inventory[i], item_data, sizeof(sd->status.inventory[0]));
-		// clear equips field first, just in case
+		// clear equip and favorite fields first, just in case
 		if( item_data->equip )
 			sd->status.inventory[i].equip = 0;
+		if( item_data->favorite )
+			sd->status.inventory[i].favorite = 0;
 
 		sd->status.inventory[i].amount = amount;
 		sd->inventory_data[i] = data;
@@ -5760,11 +5762,12 @@ const char* job_name(int class_)
 	case JOB_KAGEROU:
 	case JOB_OBORO:
 		return msg_txt(653 - JOB_KAGEROU+class_);
+
 	case JOB_REBELLION:
-		return msg_txt(694);
+		return msg_txt(655);
 
 	default:
-		return msg_txt(655);
+		return msg_txt(656);
 	}
 }