summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-12-10 17:37:13 -0200
committershennetsind <ind@henn.et>2013-12-10 17:37:13 -0200
commitd23abe0be6814a8b63a50716bac4963c6b6c0517 (patch)
tree375f725a41f4f16fbd06d309cc8e574ce5ab13ef /src
parentb4136dd3d4779d80df18f84929c576c8080cd7b8 (diff)
parentc3c5e31443c218fb7fbf42b2c48d158b01f37131 (diff)
downloadhercules-d23abe0be6814a8b63a50716bac4963c6b6c0517.tar.gz
hercules-d23abe0be6814a8b63a50716bac4963c6b6c0517.tar.bz2
hercules-d23abe0be6814a8b63a50716bac4963c6b6c0517.tar.xz
hercules-d23abe0be6814a8b63a50716bac4963c6b6c0517.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/map.c2
-rw-r--r--src/map/skill.c2
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc12
4 files changed, 9 insertions, 8 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 41ba732fe..a04ac0e27 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18252,6 +18252,7 @@ static void __attribute__ ((unused)) packetdb_addpacket(short cmd, int len, ...)
packet_db[cmd].pos[i] = pos;
}
+ va_end(va);
}
void packetdb_loaddb(void) {
diff --git a/src/map/map.c b/src/map/map.c
index 029e24136..d70f95dff 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -695,7 +695,7 @@ int map_vforeachinrange(int (*func)(struct block_list*, va_list), struct block_l
va_copy(apcopy, ap);
returnCount = bl_vforeach(func, blockcount, INT_MAX, apcopy);
- va_end(ap);
+ va_end(apcopy);
return returnCount;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index e8538d286..2eda450a7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3198,7 +3198,7 @@ int skill_timerskill(int tid, int64 tick, int id, intptr_t data) {
break;
case GN_SPORE_EXPLOSION:
map->foreachinrange(skill->area_sub, target, skill->get_splash(skl->skill_id, skl->skill_lv), BL_CHAR,
- src, skl->skill_id, skl->skill_lv, 0, skl->flag|1|BCT_ENEMY, skill->castend_damage_id);
+ src, skl->skill_id, skl->skill_lv, (int64)0, skl->flag|1|BCT_ENEMY, skill->castend_damage_id);
break;
case SR_FLASHCOMBO_ATK_STEP1:
case SR_FLASHCOMBO_ATK_STEP2:
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 4ba06eba4..f920d096f 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -45430,14 +45430,14 @@ int HP_pc_clean_skilltree(struct map_session_data *sd) {
}
return retVal___;
}
-int HP_pc_setpos(struct map_session_data *sd, unsigned short mapindex, int x, int y, clr_type clrtype) {
+int HP_pc_setpos(struct map_session_data *sd, unsigned short map_index, int x, int y, clr_type clrtype) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_pc_setpos_pre ) {
- int (*preHookFunc) (struct map_session_data *sd, unsigned short *mapindex, int *x, int *y, clr_type *clrtype);
+ int (*preHookFunc) (struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype);
for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_pc_setpos_pre[hIndex].func;
- retVal___ = preHookFunc(sd, &mapindex, &x, &y, &clrtype);
+ retVal___ = preHookFunc(sd, &map_index, &x, &y, &clrtype);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -45445,13 +45445,13 @@ int HP_pc_setpos(struct map_session_data *sd, unsigned short mapindex, int x, in
}
}
{
- retVal___ = HPMHooks.source.pc.setpos(sd, mapindex, x, y, clrtype);
+ retVal___ = HPMHooks.source.pc.setpos(sd, map_index, x, y, clrtype);
}
if( HPMHooks.count.HP_pc_setpos_post ) {
- int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *mapindex, int *x, int *y, clr_type *clrtype);
+ int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *map_index, int *x, int *y, clr_type *clrtype);
for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_setpos_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_pc_setpos_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, sd, &mapindex, &x, &y, &clrtype);
+ retVal___ = postHookFunc(retVal___, sd, &map_index, &x, &y, &clrtype);
}
}
return retVal___;