summaryrefslogtreecommitdiff
path: root/library/Core.cpp
diff options
context:
space:
mode:
authorClayton Hughes2012-03-11 23:31:29 -0700
committerClayton Hughes2012-03-11 23:31:29 -0700
commit445b580ad148767f7b623e156f0d9b8b1284b4d9 (patch)
treed15c7017f9b381b7b88a3747cc346ad9e3e40171 /library/Core.cpp
parent47bbe1a3ff732e45b69f632cdb3fe4eeed1b8e81 (diff)
downloaddfhack-445b580ad148767f7b623e156f0d9b8b1284b4d9.tar.gz
dfhack-445b580ad148767f7b623e156f0d9b8b1284b4d9.tar.bz2
dfhack-445b580ad148767f7b623e156f0d9b8b1284b4d9.tar.xz
Added 'script' command to load DFHack scripts from file. Syntax is the same as dfhack.init / interactive.
Diffstat (limited to 'library/Core.cpp')
-rw-r--r--library/Core.cpp31
1 files changed, 26 insertions, 5 deletions
diff --git a/library/Core.cpp b/library/Core.cpp
index 82788aff..1b8d5388 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -68,6 +68,10 @@ using namespace tthread;
using namespace df::enums;
using df::global::init;
+static void loadScriptFile(Core *core, PluginManager *plug_mgr, string fname);
+static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clueless_counter, const string &command);
+static bool parseKeySpec(std::string keyspec, int *psym, int *pmod);
+
struct Core::Cond
{
Cond()
@@ -372,6 +376,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
" die - Force DF to close immediately\n"
" keybinding - Modify bindings of commands to keys\n"
" belongs COMMAND - Tell which plugin a command belongs to.\n"
+ " script FILENAME - Run the commands specified in a file.\n"
" plug [PLUGIN|v] - List plugin state and detailed description.\n"
" load PLUGIN|all - Load a plugin by name or load all possible plugins.\n"
" unload PLUGIN|all - Unload a plugin or all loaded plugins.\n"
@@ -467,6 +472,18 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
{
_exit(666);
}
+ else if(first == "script")
+ {
+ if(parts.size() == 1)
+ {
+ loadScriptFile(core, plug_mgr, parts[0]);
+ }
+ else
+ {
+ con << "Usage:" << endl
+ << " script <filename>" << endl;
+ }
+ }
else
{
command_result res = plug_mgr->InvokeCommand(first, parts);
@@ -479,15 +496,19 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
}
}
-static void loadInitFile(Core *core, PluginManager *plug_mgr, string fname)
+static void loadScriptFile(Core *core, PluginManager *plug_mgr, string fname)
{
- ifstream init(fname);
- if (init.bad())
+ core->con << "Loading script at " << fname << std::endl;
+ ifstream script(fname);
+ if (script.bad())
+ {
+ core->con.printerr("Error loading script\n");
return;
+ }
int tmp = 0;
string command;
- while (getline(init, command))
+ while (getline(script, command))
{
if (!command.empty())
runInteractiveCommand(core, plug_mgr, tmp, command);
@@ -511,7 +532,7 @@ void fIOthread(void * iodata)
return;
}
- loadInitFile(core, plug_mgr, "dfhack.init");
+ loadScriptFile(core, plug_mgr, "dfhack.init");
con.print("DFHack is ready. Have a nice day!\n"
"Type in '?' or 'help' for general help, 'ls' to see all commands.\n");