MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow specifying parameters in hotkey commands. 

Now that hotkeys can be set to arbitrary strings, tokenize them.
develop
Alexander Gavrilov 2011-12-30 18:27:55 +04:00
parent 53346328e8
commit b71e577771
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Core.cpp
Unescape Escape View File

@ -148,8 +148,17 @@ void fHKthread(void * iodata)
std::string stuff = core->getHotkeyCmd(); // waits on mutex! std::string stuff = core->getHotkeyCmd(); // waits on mutex!
if(!stuff.empty()) if(!stuff.empty())
{ {
vector <string> crap; vector <string> args;
command_result cr = plug_mgr->InvokeCommand(stuff, crap, false); cheap_tokenise(stuff, args);
if (args.empty()) {
core->con.printerr("Empty hotkey command.\n");
continue;
}
string first = args[0];
args.erase(args.begin());
command_result cr = plug_mgr->InvokeCommand(first, args, false);
if(cr == CR_WOULD_BREAK) if(cr == CR_WOULD_BREAK)
{ {
core->con.printerr("It isn't possible to run an interactive command outside the console.\n"); core->con.printerr("It isn't possible to run an interactive command outside the console.\n");