Skip to content

Commit

Permalink
Follow up to 01f61cf
Browse files Browse the repository at this point in the history
Found some leftovers that were still using the wrong tick type and therefore screwing up the variable argument addresses.

Fixes #3807

Thanks to @zeffen
  • Loading branch information
Lemongrass3110 committed Jan 2, 2019
1 parent 65fc40f commit 4613864
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/map/skill.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18445,7 +18445,7 @@ int skill_unit_timer_sub_onplace(struct block_list* bl, va_list ap)
{
struct skill_unit* unit = va_arg(ap,struct skill_unit *);
struct skill_unit_group* group = NULL;
t_tick tick = va_arg(ap,unsigned int);
t_tick tick = va_arg(ap,t_tick);

nullpo_ret(unit);

Expand All @@ -18472,7 +18472,7 @@ static int skill_unit_timer_sub(DBKey key, DBData *data, va_list ap)
{
struct skill_unit* unit = (struct skill_unit*)db_data2ptr(data);
struct skill_unit_group* group = NULL;
t_tick tick = va_arg(ap,unsigned int);
t_tick tick = va_arg(ap,t_tick);
bool dissonance;
struct block_list* bl = &unit->bl;

Expand Down Expand Up @@ -18755,7 +18755,7 @@ int skill_unit_move_sub(struct block_list* bl, va_list ap)
struct skill_unit_group* group = NULL;

struct block_list* target = va_arg(ap,struct block_list*);
t_tick tick = va_arg(ap,unsigned int);
t_tick tick = va_arg(ap,t_tick);
int flag = va_arg(ap,int);
bool dissonance;
uint16 skill_id;
Expand Down
2 changes: 1 addition & 1 deletion src/map/status.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13786,7 +13786,7 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
struct block_list* src = va_arg(ap,struct block_list*);
struct status_change_entry* sce = va_arg(ap,struct status_change_entry*);
enum sc_type type = (sc_type)va_arg(ap,int); // gcc: enum args get promoted to int
t_tick tick = va_arg(ap,unsigned int);
t_tick tick = va_arg(ap,t_tick);

if (status_isdead(bl))
return 0;
Expand Down

0 comments on commit 4613864

Please sign in to comment.