summaryrefslogtreecommitdiff
path: root/library/Core.cpp
diff options
context:
space:
mode:
authorPetr Mrázek2012-04-16 22:37:07 +0200
committerPetr Mrázek2012-04-16 22:37:07 +0200
commit7946cafc8673401bcfa2ff2e116592755a0968f4 (patch)
tree58edee08be5ece5637bb7ed550498ee1c96f8b74 /library/Core.cpp
parentd2dde361adf311f2158bd11ea189025c736adc55 (diff)
parentf3c7a685f5b6d84bff6193ad289df3cda634a4ee (diff)
downloaddfhack-7946cafc8673401bcfa2ff2e116592755a0968f4.tar.gz
dfhack-7946cafc8673401bcfa2ff2e116592755a0968f4.tar.bz2
dfhack-7946cafc8673401bcfa2ff2e116592755a0968f4.tar.xz
Merge https://github.com/jaxad0127/dfhack
Diffstat (limited to 'library/Core.cpp')
-rw-r--r--library/Core.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/library/Core.cpp b/library/Core.cpp
index 16d90bfb..6e1e0986 100644
--- a/library/Core.cpp
+++ b/library/Core.cpp
@@ -120,7 +120,7 @@ struct Core::Private
}
};
-void cheap_tokenise(string const& input, vector<string> &output)
+void Core::cheap_tokenise(string const& input, vector<string> &output)
{
string *cur = NULL;
@@ -179,7 +179,7 @@ void fHKthread(void * iodata)
color_ostream_proxy out(core->getConsole());
vector <string> args;
- cheap_tokenise(stuff, args);
+ Core::cheap_tokenise(stuff, args);
if (args.empty()) {
out.printerr("Empty hotkey command.\n");
continue;
@@ -220,7 +220,7 @@ static void runInteractiveCommand(Core *core, PluginManager *plug_mgr, int &clue
{
// cut the input into parts
vector <string> parts;
- cheap_tokenise(command,parts);
+ Core::cheap_tokenise(command,parts);
if(parts.size() == 0)
{
clueless_counter ++;