use constructor syntax and find_if-ify

DFHack · Dec 20, 2024 · 723de97 · 723de97
1 parent d08863a
commit 723de97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp
@@ -469,35 +469,32 @@ bool Plugin::reload(color_ostream &out)
 
 command_result Plugin::invoke(color_ostream &out, const std::string & command, std::vector <std::string> & parameters)
 {
-    Core & c = Core::getInstance();
     command_result cr = CR_NOT_IMPLEMENTED;
     access->lock_add();
     if (state == PS_LOADED) {
-        for (auto & cmd : commands) {
-            if (cmd.name != command)
-                continue;
-
+        if (auto cmdIt = std::ranges::find_if(commands, [&](const PluginCommand &cmd) { return cmd.name == command; });
+            commands.end() != cmdIt)
+        {
             // running interactive things from some other source than the console would break it
-            if (!out.is_console() && cmd.interactive)
+            if (!out.is_console() && cmdIt->interactive)
                 cr = CR_NEEDS_CONSOLE;
-            else if (cmd.guard) {
-                CoreSuspender suspend(&c);
-                if (!cmd.guard(c.getTopViewscreen())) {
+            else if (cmdIt->guard) {
+                CoreSuspender suspend;
+                if (!cmdIt->guard(Core::getInstance().getTopViewscreen())) {
                     out.printerr("Could not invoke %s: unsuitable UI state.\n", command.c_str());
                     cr = CR_WRONG_USAGE;
                 }
                 else {
-                    cr = cmd.function(out, parameters);
+                    cr = cmdIt->function(out, parameters);
                 }
             }
-            else if (cmd.unlocked) {
-                cr = cmd.function(out, parameters);
+            else if (cmdIt->unlocked) {
+                cr = cmdIt->function(out, parameters);
             }
             else {
-                CoreSuspender suspend(&c);
-                cr = cmd.function(out, parameters);
+                CoreSuspender suspend;
+                cr = cmdIt->function(out, parameters);
             }
-            break;
         }
     }
     access->lock_sub();

diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
@@ -102,9 +102,9 @@ namespace DFHack
                       bool unlocked_ = false,
                       const char * usage_ = ""
                      )
-            : name(_name), description(_description), function(function_),
-              interactive(interactive_), unlocked(unlocked_), guard(NULL),
-              usage(usage_)
+            : name{_name}, description{_description}, function{function_},
+              interactive{interactive_}, unlocked{unlocked_}, guard{NULL},
+              usage{usage_}
         {
             fix_usage();
         }
@@ -114,9 +114,9 @@ namespace DFHack
                       command_function function_,
                       command_hotkey_guard guard_,
                       const char * usage_ = "")
-            : name(_name), description(_description), function(function_),
-              interactive(false), unlocked(false), guard(guard_),
-              usage(usage_)
+            : name{_name}, description{_description}, function{function_},
+              interactive{false}, unlocked{false}, guard{guard_},
+              usage{usage_}
         {
             fix_usage();
         }