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

Rename save/load to "save data"/"load data"

develop
lethosor 2019-05-29 19:52:03 -04:00
parent ceebef5fe2
commit 5b11d14c6c
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Core.cpp
Unescape Escape View File

@ -2027,7 +2027,7 @@ void Core::doUpdate(color_ostream &out, bool first_update)
if (df::global::ui->main.autosave_request || (vs_changed && strict_virtual_cast<df::viewscreen_savegamest>(screen))) if (df::global::ui->main.autosave_request || (vs_changed && strict_virtual_cast<df::viewscreen_savegamest>(screen)))
{ {
doSave(out); doSaveData(out);
} }
out << std::flush; out << std::flush;
@ -2280,20 +2280,20 @@ void Core::onStateChange(color_ostream &out, state_change_event event)
} }
if (event == SC_WORLD_LOADED) if (event == SC_WORLD_LOADED)
{ {
doLoad(out); doLoadData(out);
} }
} }
void Core::doSave(color_ostream &out) void Core::doSaveData(color_ostream &out)
{ {
plug_mgr->doSave(out); plug_mgr->doSaveData(out);
Persistence::Internal::save(); Persistence::Internal::save();
} }
void Core::doLoad(color_ostream &out) void Core::doLoadData(color_ostream &out)
{ {
Persistence::Internal::load(); Persistence::Internal::load();
plug_mgr->doLoad(out); plug_mgr->doLoadData(out);
} }
int Core::Shutdown ( void ) int Core::Shutdown ( void )

32
library/PluginManager.cpp
Unescape Escape View File

@ -197,8 +197,8 @@ Plugin::Plugin(Core * core, const std::string & path,
plugin_rpcconnect = 0; plugin_rpcconnect = 0;
plugin_enable = 0; plugin_enable = 0;
plugin_is_enabled = 0; plugin_is_enabled = 0;
plugin_save = 0; plugin_save_data = 0;
plugin_load = 0; plugin_load_data = 0;
plugin_eval_ruby = 0; plugin_eval_ruby = 0;
state = PS_UNLOADED; state = PS_UNLOADED;
access = new RefLock(); access = new RefLock();
@ -351,8 +351,8 @@ bool Plugin::load(color_ostream &con)
plugin_rpcconnect = (RPCService* (*)(color_ostream &)) LookupPlugin(plug, "plugin_rpcconnect"); plugin_rpcconnect = (RPCService* (*)(color_ostream &)) LookupPlugin(plug, "plugin_rpcconnect");
plugin_enable = (command_result (*)(color_ostream &,bool)) LookupPlugin(plug, "plugin_enable"); plugin_enable = (command_result (*)(color_ostream &,bool)) LookupPlugin(plug, "plugin_enable");
plugin_is_enabled = (bool*) LookupPlugin(plug, "plugin_is_enabled"); plugin_is_enabled = (bool*) LookupPlugin(plug, "plugin_is_enabled");
plugin_save = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_save"); plugin_save_data = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_save_data");
plugin_load = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_load"); plugin_load_data = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_load_data");
plugin_eval_ruby = (command_result (*)(color_ostream &, const char*)) LookupPlugin(plug, "plugin_eval_ruby"); plugin_eval_ruby = (command_result (*)(color_ostream &, const char*)) LookupPlugin(plug, "plugin_eval_ruby");
index_lua(plug); index_lua(plug);
plugin_lib = plug; plugin_lib = plug;
@ -364,7 +364,7 @@ bool Plugin::load(color_ostream &con)
parent->registerCommands(this); parent->registerCommands(this);
if ((plugin_onupdate || plugin_enable) && !plugin_is_enabled) if ((plugin_onupdate || plugin_enable) && !plugin_is_enabled)
con.printerr("Plugin %s has no enabled var!\n", name.c_str()); con.printerr("Plugin %s has no enabled var!\n", name.c_str());
if (Core::getInstance().isWorldLoaded() && plugin_load && plugin_load(con) != CR_OK) if (Core::getInstance().isWorldLoaded() && plugin_load_data && plugin_load_data(con) != CR_OK)
con.printerr("Plugin %s has failed to load saved data.\n", name.c_str()); con.printerr("Plugin %s has failed to load saved data.\n", name.c_str());
fprintf(stderr, "loaded plugin %s; DFHack build %s\n", name.c_str(), plug_git_desc); fprintf(stderr, "loaded plugin %s; DFHack build %s\n", name.c_str(), plug_git_desc);
fflush(stderr); fflush(stderr);
@ -410,7 +410,7 @@ bool Plugin::unload(color_ostream &con)
// enter suspend // enter suspend
CoreSuspender suspend; CoreSuspender suspend;
access->lock(); access->lock();
if (Core::getInstance().isWorldLoaded() && plugin_save && plugin_save(con) != CR_OK) if (Core::getInstance().isWorldLoaded() && plugin_save_data && plugin_save_data(con) != CR_OK)
con.printerr("Plugin %s has failed to save data.\n", name.c_str()); con.printerr("Plugin %s has failed to save data.\n", name.c_str());
// notify plugin about shutdown, if it has a shutdown function // notify plugin about shutdown, if it has a shutdown function
command_result cr = CR_OK; command_result cr = CR_OK;
@ -419,8 +419,8 @@ bool Plugin::unload(color_ostream &con)
// cleanup... // cleanup...
plugin_is_enabled = 0; plugin_is_enabled = 0;
plugin_onupdate = 0; plugin_onupdate = 0;
plugin_save = 0; plugin_save_data = 0;
plugin_load = 0; plugin_load_data = 0;
reset_lua(); reset_lua();
parent->unregisterCommands(this); parent->unregisterCommands(this);
commands.clear(); commands.clear();
@ -585,10 +585,10 @@ command_result Plugin::save_data(color_ostream &out)
{ {
command_result cr = CR_NOT_IMPLEMENTED; command_result cr = CR_NOT_IMPLEMENTED;
access->lock_add(); access->lock_add();
if(state == PS_LOADED && plugin_save) if(state == PS_LOADED && plugin_save_data)
{ {
cr = plugin_save(out); cr = plugin_save_data(out);
Lua::Core::Reset(out, "plugin_save"); Lua::Core::Reset(out, "plugin_save_data");
} }
access->lock_sub(); access->lock_sub();
return cr; return cr;
@ -598,10 +598,10 @@ command_result Plugin::load_data(color_ostream &out)
{ {
command_result cr = CR_NOT_IMPLEMENTED; command_result cr = CR_NOT_IMPLEMENTED;
access->lock_add(); access->lock_add();
if(state == PS_LOADED && plugin_load) if(state == PS_LOADED && plugin_load_data)
{ {
cr = plugin_load(out); cr = plugin_load_data(out);
Lua::Core::Reset(out, "plugin_load"); Lua::Core::Reset(out, "plugin_load_data");
} }
access->lock_sub(); access->lock_sub();
return cr; return cr;
@ -1051,7 +1051,7 @@ void PluginManager::unregisterCommands( Plugin * p )
cmdlist_mutex->unlock(); cmdlist_mutex->unlock();
} }
void PluginManager::doSave(color_ostream &out) void PluginManager::doSaveData(color_ostream &out)
{ {
for (auto it = begin(); it != end(); ++it) for (auto it = begin(); it != end(); ++it)
{ {
@ -1062,7 +1062,7 @@ void PluginManager::doSave(color_ostream &out)
} }
} }
void PluginManager::doLoad(color_ostream &out) void PluginManager::doLoadData(color_ostream &out)
{ {
for (auto it = begin(); it != end(); ++it) for (auto it = begin(); it != end(); ++it)
{ {

4
library/include/Core.h
Unescape Escape View File

@ -222,8 +222,8 @@ namespace DFHack
void onUpdate(color_ostream &out); void onUpdate(color_ostream &out);
void onStateChange(color_ostream &out, state_change_event event); void onStateChange(color_ostream &out, state_change_event event);
void handleLoadAndUnloadScripts(color_ostream &out, state_change_event event); void handleLoadAndUnloadScripts(color_ostream &out, state_change_event event);
void doSave(color_ostream &out); void doSaveData(color_ostream &out);
void doLoad(color_ostream &out); void doLoadData(color_ostream &out);
Core(Core const&); // Don't Implement Core(Core const&); // Don't Implement
void operator=(Core const&); // Don't implement void operator=(Core const&); // Don't implement

8
library/include/PluginManager.h
Unescape Escape View File

@ -240,8 +240,8 @@ namespace DFHack
command_result (*plugin_enable)(color_ostream &, bool); command_result (*plugin_enable)(color_ostream &, bool);
RPCService* (*plugin_rpcconnect)(color_ostream &); RPCService* (*plugin_rpcconnect)(color_ostream &);
command_result (*plugin_eval_ruby)(color_ostream &, const char*); command_result (*plugin_eval_ruby)(color_ostream &, const char*);
command_result (*plugin_save)(color_ostream &); command_result (*plugin_save_data)(color_ostream &);
command_result (*plugin_load)(color_ostream &); command_result (*plugin_load_data)(color_ostream &);
}; };
class DFHACK_EXPORT PluginManager class DFHACK_EXPORT PluginManager
{ {
@ -255,8 +255,8 @@ namespace DFHack
void OnStateChange(color_ostream &out, state_change_event event); void OnStateChange(color_ostream &out, state_change_event event);
void registerCommands( Plugin * p ); void registerCommands( Plugin * p );
void unregisterCommands( Plugin * p ); void unregisterCommands( Plugin * p );
void doSave(color_ostream &out); void doSaveData(color_ostream &out);
void doLoad(color_ostream &out); void doLoadData(color_ostream &out);
// PUBLIC METHODS // PUBLIC METHODS
public: public:
// list names of all plugins present in hack/plugins // list names of all plugins present in hack/plugins

12
plugins/skeleton/skeleton.cpp
Unescape Escape View File

@ -90,18 +90,18 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
*/ */
// If you need to save or load world-specific data, define these functions. // If you need to save or load world-specific data, define these functions.
// plugin_save is called when the game might be about to save the world, // plugin_save_data is called when the game might be about to save the world,
// and plugin_load is called whenever a new world is loaded. If the plugin // and plugin_load_data is called whenever a new world is loaded. If the plugin
// is loaded or unloaded while a world is active, plugin_save or plugin_load // is loaded or unloaded while a world is active, plugin_save_data or
// will be called immediately. // plugin_load_data will be called immediately.
/* /*
DFhackCExport command_result plugin_save( color_ostream &out ) DFhackCExport command_result plugin_save_data (color_ostream &out)
{ {
// Call functions in the Persistence module here. // Call functions in the Persistence module here.
return CR_OK; return CR_OK;
} }
DFhackCExport command_result plugin_load( color_ostream &out ) DFhackCExport command_result plugin_load_data (color_ostream &out)
{ {
// Call functions in the Persistence module here. // Call functions in the Persistence module here.
return CR_OK; return CR_OK;