From 5b11d14c6c79020d6910d8a797aa42bd5663ba34 Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 29 May 2019 19:52:03 -0400 Subject: [PATCH] Rename save/load to "save data"/"load data" --- library/Core.cpp | 12 ++++++------ library/PluginManager.cpp | 32 ++++++++++++++++---------------- library/include/Core.h | 4 ++-- library/include/PluginManager.h | 8 ++++---- plugins/skeleton/skeleton.cpp | 12 ++++++------ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/library/Core.cpp b/library/Core.cpp index 0c0fc13c2..1f4c5859c 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -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(screen))) { - doSave(out); + doSaveData(out); } out << std::flush; @@ -2280,20 +2280,20 @@ void Core::onStateChange(color_ostream &out, state_change_event event) } 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(); } -void Core::doLoad(color_ostream &out) +void Core::doLoadData(color_ostream &out) { Persistence::Internal::load(); - plug_mgr->doLoad(out); + plug_mgr->doLoadData(out); } int Core::Shutdown ( void ) diff --git a/library/PluginManager.cpp b/library/PluginManager.cpp index 6f608f91c..05db0521d 100644 --- a/library/PluginManager.cpp +++ b/library/PluginManager.cpp @@ -197,8 +197,8 @@ Plugin::Plugin(Core * core, const std::string & path, plugin_rpcconnect = 0; plugin_enable = 0; plugin_is_enabled = 0; - plugin_save = 0; - plugin_load = 0; + plugin_save_data = 0; + plugin_load_data = 0; plugin_eval_ruby = 0; state = PS_UNLOADED; access = new RefLock(); @@ -351,8 +351,8 @@ bool Plugin::load(color_ostream &con) plugin_rpcconnect = (RPCService* (*)(color_ostream &)) LookupPlugin(plug, "plugin_rpcconnect"); plugin_enable = (command_result (*)(color_ostream &,bool)) LookupPlugin(plug, "plugin_enable"); plugin_is_enabled = (bool*) LookupPlugin(plug, "plugin_is_enabled"); - plugin_save = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_save"); - plugin_load = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_load"); + plugin_save_data = (command_result (*)(color_ostream &)) LookupPlugin(plug, "plugin_save_data"); + 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"); index_lua(plug); plugin_lib = plug; @@ -364,7 +364,7 @@ bool Plugin::load(color_ostream &con) parent->registerCommands(this); if ((plugin_onupdate || plugin_enable) && !plugin_is_enabled) 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()); fprintf(stderr, "loaded plugin %s; DFHack build %s\n", name.c_str(), plug_git_desc); fflush(stderr); @@ -410,7 +410,7 @@ bool Plugin::unload(color_ostream &con) // enter suspend CoreSuspender suspend; 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()); // notify plugin about shutdown, if it has a shutdown function command_result cr = CR_OK; @@ -419,8 +419,8 @@ bool Plugin::unload(color_ostream &con) // cleanup... plugin_is_enabled = 0; plugin_onupdate = 0; - plugin_save = 0; - plugin_load = 0; + plugin_save_data = 0; + plugin_load_data = 0; reset_lua(); parent->unregisterCommands(this); commands.clear(); @@ -585,10 +585,10 @@ command_result Plugin::save_data(color_ostream &out) { command_result cr = CR_NOT_IMPLEMENTED; access->lock_add(); - if(state == PS_LOADED && plugin_save) + if(state == PS_LOADED && plugin_save_data) { - cr = plugin_save(out); - Lua::Core::Reset(out, "plugin_save"); + cr = plugin_save_data(out); + Lua::Core::Reset(out, "plugin_save_data"); } access->lock_sub(); return cr; @@ -598,10 +598,10 @@ command_result Plugin::load_data(color_ostream &out) { command_result cr = CR_NOT_IMPLEMENTED; access->lock_add(); - if(state == PS_LOADED && plugin_load) + if(state == PS_LOADED && plugin_load_data) { - cr = plugin_load(out); - Lua::Core::Reset(out, "plugin_load"); + cr = plugin_load_data(out); + Lua::Core::Reset(out, "plugin_load_data"); } access->lock_sub(); return cr; @@ -1051,7 +1051,7 @@ void PluginManager::unregisterCommands( Plugin * p ) cmdlist_mutex->unlock(); } -void PluginManager::doSave(color_ostream &out) +void PluginManager::doSaveData(color_ostream &out) { 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) { diff --git a/library/include/Core.h b/library/include/Core.h index a5fca570a..a0c791c2e 100644 --- a/library/include/Core.h +++ b/library/include/Core.h @@ -222,8 +222,8 @@ namespace DFHack void onUpdate(color_ostream &out); void onStateChange(color_ostream &out, state_change_event event); void handleLoadAndUnloadScripts(color_ostream &out, state_change_event event); - void doSave(color_ostream &out); - void doLoad(color_ostream &out); + void doSaveData(color_ostream &out); + void doLoadData(color_ostream &out); Core(Core const&); // Don't Implement void operator=(Core const&); // Don't implement diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h index 8cb75cff1..8f73c8ec2 100644 --- a/library/include/PluginManager.h +++ b/library/include/PluginManager.h @@ -240,8 +240,8 @@ namespace DFHack command_result (*plugin_enable)(color_ostream &, bool); RPCService* (*plugin_rpcconnect)(color_ostream &); command_result (*plugin_eval_ruby)(color_ostream &, const char*); - command_result (*plugin_save)(color_ostream &); - command_result (*plugin_load)(color_ostream &); + command_result (*plugin_save_data)(color_ostream &); + command_result (*plugin_load_data)(color_ostream &); }; class DFHACK_EXPORT PluginManager { @@ -255,8 +255,8 @@ namespace DFHack void OnStateChange(color_ostream &out, state_change_event event); void registerCommands( Plugin * p ); void unregisterCommands( Plugin * p ); - void doSave(color_ostream &out); - void doLoad(color_ostream &out); + void doSaveData(color_ostream &out); + void doLoadData(color_ostream &out); // PUBLIC METHODS public: // list names of all plugins present in hack/plugins diff --git a/plugins/skeleton/skeleton.cpp b/plugins/skeleton/skeleton.cpp index 82d988a2e..c06ca26cb 100644 --- a/plugins/skeleton/skeleton.cpp +++ b/plugins/skeleton/skeleton.cpp @@ -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. -// plugin_save 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 -// is loaded or unloaded while a world is active, plugin_save or plugin_load -// will be called immediately. +// plugin_save_data is called when the game might be about to save the world, +// 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_data or +// 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. 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. return CR_OK;