summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-30 14:44:56 -0200
committershennetsind <ind@henn.et>2013-11-30 14:44:56 -0200
commit4e20f139fa7d0ebd6de30fde9b91ec5e235981d2 (patch)
treec42b4af0c8a7be63ef7ff7fc56fcfd017e982cd1 /src/map
parent6fc1cae2088dd9f450e15728ca4bf4a82fcb8070 (diff)
parentc952fe0da69ebd5371004d6737a4e2e54859b9b0 (diff)
downloadhercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.gz
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.bz2
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.xz
hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/pc.c9
2 files changed, 7 insertions, 4 deletions
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);
}
}