diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-11-27 13:47:33 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-11-27 13:47:33 +0000 |
| commit | 70c2692d38e6fac1c230a51c283438de11a61ce1 (patch) | |
| tree | f1b3713ad5ce48f48e688bb627edc51af067eb0d /src/map/script-fun.cpp | |
| parent | 4d23200c606b5c96877384f5ab2820a6cfcadda8 (diff) | |
| parent | 78ad8bcab7a0d29200e8cd47c1d759d0eeb15a72 (diff) | |
| download | tmwa-70c2692d38e6fac1c230a51c283438de11a61ce1.tar.gz tmwa-70c2692d38e6fac1c230a51c283438de11a61ce1.tar.bz2 tmwa-70c2692d38e6fac1c230a51c283438de11a61ce1.tar.xz tmwa-70c2692d38e6fac1c230a51c283438de11a61ce1.zip | |
Merge branch 'activity_checks' into 'master'
activity checks and status cleanup
See merge request legacy/tmwa!252
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index fd3f798..8dc1989 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -117,6 +117,10 @@ void builtin_mes(ScriptState *st) clif_scriptmes(sd, st->oid, mes); } +/*========================================== + * + *------------------------------------------ + */ static void builtin_mesq(ScriptState *st) { @@ -131,6 +135,10 @@ void builtin_mesq(ScriptState *st) clif_scriptmes(sd, st->oid, RString(mesq)); } +/*========================================== + * + *------------------------------------------ + */ static void builtin_mesn(ScriptState *st) { @@ -148,6 +156,10 @@ void builtin_mesn(ScriptState *st) clif_scriptmes(sd, st->oid, RString(mesq)); } +/*========================================== + * + *------------------------------------------ + */ static void builtin_clear(ScriptState *st) { @@ -2440,7 +2452,7 @@ void builtin_overrideattack(ScriptState *st) sd->attack_spell_override = BlockId(); pc_set_weapon_icon(sd, 0, StatusChange::ZERO, ItemNameId()); pc_set_attack_info(sd, interval_t::zero(), 0); - pc_calcstatus(sd, 0); + pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC); } } @@ -2508,7 +2520,7 @@ void builtin_setopt2(ScriptState *st) return; sd->opt2 = new_opt2; clif_changeoption(sd); - pc_calcstatus(sd, 0); + pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC); } @@ -4827,7 +4839,7 @@ void builtin_nude(ScriptState *st) if (idx.ok()) pc_unequipitem(sd, idx, CalcStatus::LATER); } - pc_calcstatus(sd, 0); + pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC); } @@ -4850,7 +4862,7 @@ void builtin_unequipbyid(ScriptState *st) pc_unequipitem(sd, idx, CalcStatus::LATER); } - pc_calcstatus(sd, 0); + pc_calcstatus(sd, (int)CalcStatusKind::NORMAL_RECALC); } @@ -5563,7 +5575,6 @@ void builtin_mapexit(ScriptState *) runflag = 0; } - #define BUILTIN(func, args, ret) \ {builtin_##func, #func ## _s, args, ret} |