summaryrefslogtreecommitdiff
path: root/library/include
diff options
context:
space:
mode:
authorPetr Mrázek2012-07-09 01:13:07 +0200
committerPetr Mrázek2012-07-09 01:13:07 +0200
commita5977db443aeaa3cf64ab341e254efdb05bd5519 (patch)
tree3ca401d05bb109a3c0b1ef721599007988b230b5 /library/include
parent6975f643fc4917b84e501189657bcbfaec3ca982 (diff)
parentc20951c30bd089da4a6d348265a851bc577e7fc3 (diff)
downloaddfhack-a5977db443aeaa3cf64ab341e254efdb05bd5519.tar.gz
dfhack-a5977db443aeaa3cf64ab341e254efdb05bd5519.tar.bz2
dfhack-a5977db443aeaa3cf64ab341e254efdb05bd5519.tar.xz
Merge https://github.com/jjyg/dfhack
Diffstat (limited to 'library/include')
-rw-r--r--library/include/Core.h5
-rw-r--r--library/include/PluginManager.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/library/include/Core.h b/library/include/Core.h
index 653298d8..d25beef5 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -75,7 +75,9 @@ namespace DFHack
SC_MAP_UNLOADED = 3,
SC_VIEWSCREEN_CHANGED = 4,
SC_CORE_INITIALIZED = 5,
- SC_BEGIN_UNLOAD = 6
+ SC_BEGIN_UNLOAD = 6,
+ SC_PAUSED = 7,
+ SC_UNPAUSED = 8
};
// Core is a singleton. Why? Because it is closely tied to SDL calls. It tracks the global state of DF.
@@ -228,6 +230,7 @@ namespace DFHack
// for state change tracking
void *last_local_map_ptr;
df::viewscreen *top_viewscreen;
+ bool last_pause_state;
// Very important!
bool started;
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index 5da9fc92..22171a15 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -209,7 +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*);
+ command_result (*plugin_eval_ruby)(color_ostream &, const char*);
};
class DFHACK_EXPORT PluginManager
{
@@ -238,7 +238,7 @@ namespace DFHack
{
return all_plugins.size();
}
- command_result (*eval_ruby)(const char*);
+ command_result (*eval_ruby)(color_ostream &, const char*);
// DATA
private:
tthread::mutex * cmdlist_mutex;