Cleanup of script hooks to reduce clang warnings.
This commit is contained in:
parent
f1d706b356
commit
70ac3813cf
|
@ -2,7 +2,7 @@
|
||||||
{ \
|
{ \
|
||||||
try { \
|
try { \
|
||||||
auto aggregator = (source)->GetScriptIterator(); \
|
auto aggregator = (source)->GetScriptIterator(); \
|
||||||
ArbUt::BorrowedPtr<CreatureLib::Battling::BattleScript> next = (CreatureLib::Battling::BattleScript*)1; \
|
ArbUt::BorrowedPtr<CreatureLib::Battling::BattleScript> next; \
|
||||||
while (aggregator.GetNext(next)) { \
|
while (aggregator.GetNext(next)) { \
|
||||||
if (next->IsSuppressed()) { \
|
if (next->IsSuppressed()) { \
|
||||||
continue; \
|
continue; \
|
||||||
|
@ -25,11 +25,11 @@
|
||||||
try { \
|
try { \
|
||||||
if (scriptWrapper.HasValue()) { \
|
if (scriptWrapper.HasValue()) { \
|
||||||
if (scriptWrapper.IsSet()) { \
|
if (scriptWrapper.IsSet()) { \
|
||||||
for (const auto& sv : scriptWrapper.GetScriptSet()->GetIterator()) { \
|
for (const auto& scriptIterator : scriptWrapper.GetScriptSet()->GetIterator()) { \
|
||||||
if (sv->IsSuppressed()) { \
|
if (scriptIterator->IsSuppressed()) { \
|
||||||
continue; \
|
continue; \
|
||||||
} \
|
} \
|
||||||
sv->hookName(__VA_ARGS__); \
|
scriptIterator->hookName(__VA_ARGS__); \
|
||||||
} \
|
} \
|
||||||
} else { \
|
} else { \
|
||||||
if (scriptWrapper.GetScript()->get()->IsSuppressed()) { \
|
if (scriptWrapper.GetScript()->get()->IsSuppressed()) { \
|
||||||
|
|
Loading…
Reference in New Issue