summaryrefslogtreecommitdiff
path: root/src/map/pc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/pc.c')
-rw-r--r--src/map/pc.c9
1 files changed, 6 insertions, 3 deletions
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);
}
}