diff options
| author | Petr Mrázek | 2011-12-31 12:48:42 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2011-12-31 12:48:42 +0100 |
| commit | 9db20bd84de2b31a3a34f775af9ce6320f37d75a (patch) | |
| tree | b7ce117287b6f674c7971f267eb3925ccce3b642 /library/PluginManager.cpp | |
| parent | 1284b30f7967b7d595bc64783e548af7e658423f (diff) | |
| download | dfhack-9db20bd84de2b31a3a34f775af9ce6320f37d75a.tar.gz dfhack-9db20bd84de2b31a3a34f775af9ce6320f37d75a.tar.bz2 dfhack-9db20bd84de2b31a3a34f775af9ce6320f37d75a.tar.xz | |
Header changes/cleanup.
Diffstat (limited to 'library/PluginManager.cpp')
| -rw-r--r-- | library/PluginManager.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp index a520575d..29cc992b 100644 --- a/library/PluginManager.cpp +++ b/library/PluginManager.cpp @@ -23,13 +23,13 @@ distribution. */ #include "Internal.h" -#include "dfhack/Core.h" -#include "dfhack/Process.h" -#include "dfhack/PluginManager.h" -#include "dfhack/Console.h" +#include "Core.h" +#include "MemAccess.h" +#include "PluginManager.h" +#include "Console.h" -#include "dfhack/DataDefs.h" -#include "dfhack/df/viewscreen.h" +#include "DataDefs.h" +#include "df/viewscreen.h" using namespace DFHack; @@ -278,7 +278,6 @@ command_result Plugin::invoke( std::string & command, std::vector <std::string> for (int i = 0; i < commands.size();i++) { PluginCommand &cmd = commands[i]; - if(cmd.name == command) { // running interactive things from some other source than the console would break it @@ -294,7 +293,7 @@ command_result Plugin::invoke( std::string & command, std::vector <std::string> df::viewscreen *top = c.getTopViewscreen(); if ((cmd.viewscreen_type && !cmd.viewscreen_type->is_instance(top)) - || !cmd.guard(&c, top)) + || !cmd.guard(&c, top)) { c.con.printerr("Could not invoke %s: unsuitable UI state.\n", command.c_str()); cr = CR_FAILURE; |
