summaryrefslogtreecommitdiff
path: root/library/include
diff options
context:
space:
mode:
authorTimothy Collett2012-07-02 11:07:30 -0400
committerTimothy Collett2012-07-02 11:07:30 -0400
commitc24333515b7890b4bb94faefa6b536fbe910305c (patch)
treed6964647cb755119b1d094b92798c74aa5bca821 /library/include
parent421e5fd82cde1f076f3de7326b0303dd6585a4ae (diff)
parent554683929f850adfd60ed43fd0b8290a176b90c4 (diff)
downloaddfhack-c24333515b7890b4bb94faefa6b536fbe910305c.tar.gz
dfhack-c24333515b7890b4bb94faefa6b536fbe910305c.tar.bz2
dfhack-c24333515b7890b4bb94faefa6b536fbe910305c.tar.xz
Merge branch 'master' of https://github.com/jjyg/dfhack
Conflicts: library/Core.cpp Starting to merge in Ruby stuffs
Diffstat (limited to 'library/include')
-rw-r--r--library/include/ColorText.h2
-rw-r--r--library/include/PluginManager.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/library/include/ColorText.h b/library/include/ColorText.h
index 105832ef..0cc286dc 100644
--- a/library/include/ColorText.h
+++ b/library/include/ColorText.h
@@ -111,6 +111,8 @@ namespace DFHack
void printerr(const char *format, ...);
void vprinterr(const char *format, va_list args);
+ /// Get color
+ color_value color() { return cur_color; }
/// Set color (ANSI color number)
void color(color_value c);
/// Reset color to default
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index b76df437..5da9fc92 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -209,6 +209,7 @@ namespace DFHack
command_result (*plugin_onupdate)(color_ostream &);
command_result (*plugin_onstatechange)(color_ostream &, state_change_event);
RPCService* (*plugin_rpcconnect)(color_ostream &);
+ command_result (*plugin_eval_ruby)(const char*);
};
class DFHACK_EXPORT PluginManager
{
@@ -237,6 +238,7 @@ namespace DFHack
{
return all_plugins.size();
}
+ command_result (*eval_ruby)(const char*);
// DATA
private:
tthread::mutex * cmdlist_mutex;