Compile fixes from merge

This commit is contained in:
Akkadius 2018-01-13 22:04:10 -06:00
parent f91de33e5d
commit 680f1f017d

View File

@ -544,7 +544,7 @@ XS(XS__gmsay)
if (items > 4) if (items > 4)
to_minstatus = (int)SvUV(ST(4)); to_minstatus = (int)SvUV(ST(4));
quest_manager.gmsay(message, color, send_to_world, to_guilddbid, to_minstatus); quest_manager.gmsay(message, color_id, send_to_world, to_guilddbid, to_minstatus);
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }
@ -2207,7 +2207,7 @@ XS(XS__task_setselector)
dXSARGS; dXSARGS;
if(items == 1) { if(items == 1) {
int task_setid = (int)SvIV(ST(0)); int task_setid = (int)SvIV(ST(0));
quest_manager.task_setselector(task_setid); quest_manager.tasksetselector(task_setid);
} else { } else {
Perl_croak(aTHX_ "Usage: task_setselector(task_setid)"); Perl_croak(aTHX_ "Usage: task_setselector(task_setid)");
} }
@ -2293,7 +2293,7 @@ XS(XS__istaskactivityactive)
if(items == 2) { if(items == 2) {
unsigned int task_id = (int)SvIV(ST(0)); unsigned int task_id = (int)SvIV(ST(0));
unsigned int activity_id = (int)SvIV(ST(1)); unsigned int activity_id = (int)SvIV(ST(1));
RETVAL = quest_manager.istaskactivityactive(task, activity_id); RETVAL = quest_manager.istaskactivityactive(task_id, activity_id);
} else { } else {
Perl_croak(aTHX_ "Usage: istaskactivityactive(task_id, activity_id)"); Perl_croak(aTHX_ "Usage: istaskactivityactive(task_id, activity_id)");
} }
@ -2353,9 +2353,11 @@ XS(XS__resettaskactivity)
dXSARGS; dXSARGS;
unsigned int task, activity; unsigned int task, activity;
if(items == 2) { if(items == 2) {
task_id = (int)SvIV(ST(0)); int task_id = (int)SvIV(ST(0));
activity_id = (int)SvIV(ST(1)); int activity_id = (int)SvIV(ST(1));
quest_manager.resettaskactivity(task_id, activity_id); quest_manager.resettaskactivity(task_id, activity_id);
} else { } else {
Perl_croak(aTHX_ "Usage: resettaskactivity(task_id, activity_id)"); Perl_croak(aTHX_ "Usage: resettaskactivity(task_id, activity_id)");
} }