Update to latest Arbutils.

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
2020-12-13 12:15:40 +01:00
parent 2055837980
commit e642f374b9
25 changed files with 69 additions and 120 deletions
--- a/src/Battling/ScriptHandling/ScriptAggregator.hpp
+++ b/src/Battling/ScriptHandling/ScriptAggregator.hpp
@@ -48,9 +48,7 @@ namespace CreatureLib::Battling {
        std::optional<ArbUt::BorrowedPtr<Script>> GetNextNotNull() {
            while (HasNext()) {
                auto s = GetNext();
-                if (s != nullptr) {
-                    return s;
-                }
+                return s;
            }
            return {};
        }
--- a/src/Battling/ScriptHandling/ScriptMacros.hpp
+++ b/src/Battling/ScriptHandling/ScriptMacros.hpp
@@ -4,8 +4,6 @@
            auto aggregator = source->GetScriptIterator();                                                             \
            while (aggregator.HasNext()) {                                                                             \
                auto next = aggregator.GetNext();                                                                      \
-                if (next == nullptr)                                                                                   \
-                    continue;                                                                                          \
                try {                                                                                                  \
                    next->hookName(__VA_ARGS__);                                                                       \
                } catch (const std::exception& e) {                                                                    \