summaryrefslogtreecommitdiff
path: root/src/saveload/game_sl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/saveload/game_sl.cpp')
-rw-r--r--src/saveload/game_sl.cpp154
1 files changed, 81 insertions, 73 deletions
diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp
index e075326ae..bfd0b910c 100644
--- a/src/saveload/game_sl.cpp
+++ b/src/saveload/game_sl.cpp
@@ -54,64 +54,68 @@ static void SaveReal_GSDT(int *index_ptr)
Game::Save();
}
-static void Load_GSDT()
-{
- const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_script_desc, _game_script_sl_compat);
+struct GSDTChunkHandler : ChunkHandler {
+ GSDTChunkHandler() : ChunkHandler('GSDT', CH_TABLE) {}
- /* Free all current data */
- GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME)->Change(nullptr);
+ void Load() const override
+ {
+ const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_script_desc, _game_script_sl_compat);
- if (SlIterateArray() == -1) return;
+ /* Free all current data */
+ GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME)->Change(nullptr);
- _game_saveload_version = -1;
- SlObject(nullptr, slt);
+ if (SlIterateArray() == -1) return;
- if (_networking && !_network_server) {
- GameInstance::LoadEmpty();
- if (SlIterateArray() != -1) SlErrorCorrupt("Too many GameScript configs");
- return;
- }
+ _game_saveload_version = -1;
+ SlObject(nullptr, slt);
- GameConfig *config = GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME);
- if (!_game_saveload_name.empty()) {
- config->Change(_game_saveload_name.c_str(), _game_saveload_version, false, _game_saveload_is_random);
- if (!config->HasScript()) {
- /* No version of the GameScript available that can load the data. Try to load the
- * latest version of the GameScript instead. */
- config->Change(_game_saveload_name.c_str(), -1, false, _game_saveload_is_random);
+ if (_networking && !_network_server) {
+ GameInstance::LoadEmpty();
+ if (SlIterateArray() != -1) SlErrorCorrupt("Too many GameScript configs");
+ return;
+ }
+
+ GameConfig *config = GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME);
+ if (!_game_saveload_name.empty()) {
+ config->Change(_game_saveload_name.c_str(), _game_saveload_version, false, _game_saveload_is_random);
if (!config->HasScript()) {
- if (_game_saveload_name.compare("%_dummy") != 0) {
- Debug(script, 0, "The savegame has an GameScript by the name '{}', version {} which is no longer available.", _game_saveload_name, _game_saveload_version);
- Debug(script, 0, "This game will continue to run without GameScript.");
+ /* No version of the GameScript available that can load the data. Try to load the
+ * latest version of the GameScript instead. */
+ config->Change(_game_saveload_name.c_str(), -1, false, _game_saveload_is_random);
+ if (!config->HasScript()) {
+ if (_game_saveload_name.compare("%_dummy") != 0) {
+ Debug(script, 0, "The savegame has an GameScript by the name '{}', version {} which is no longer available.", _game_saveload_name, _game_saveload_version);
+ Debug(script, 0, "This game will continue to run without GameScript.");
+ } else {
+ Debug(script, 0, "The savegame had no GameScript available at the time of saving.");
+ Debug(script, 0, "This game will continue to run without GameScript.");
+ }
} else {
- Debug(script, 0, "The savegame had no GameScript available at the time of saving.");
- Debug(script, 0, "This game will continue to run without GameScript.");
+ Debug(script, 0, "The savegame has an GameScript by the name '{}', version {} which is no longer available.", _game_saveload_name, _game_saveload_version);
+ Debug(script, 0, "The latest version of that GameScript has been loaded instead, but it'll not get the savegame data as it's incompatible.");
}
- } else {
- Debug(script, 0, "The savegame has an GameScript by the name '{}', version {} which is no longer available.", _game_saveload_name, _game_saveload_version);
- Debug(script, 0, "The latest version of that GameScript has been loaded instead, but it'll not get the savegame data as it's incompatible.");
+ /* Make sure the GameScript doesn't get the saveload data, as it was not the
+ * writer of the saveload data in the first place */
+ _game_saveload_version = -1;
}
- /* Make sure the GameScript doesn't get the saveload data, as it was not the
- * writer of the saveload data in the first place */
- _game_saveload_version = -1;
}
- }
- config->StringToSettings(_game_saveload_settings);
+ config->StringToSettings(_game_saveload_settings);
- /* Start the GameScript directly if it was active in the savegame */
- Game::StartNew();
- Game::Load(_game_saveload_version);
+ /* Start the GameScript directly if it was active in the savegame */
+ Game::StartNew();
+ Game::Load(_game_saveload_version);
- if (SlIterateArray() != -1) SlErrorCorrupt("Too many GameScript configs");
-}
+ if (SlIterateArray() != -1) SlErrorCorrupt("Too many GameScript configs");
+ }
-static void Save_GSDT()
-{
- SlTableHeader(_game_script_desc);
- SlSetArrayIndex(0);
- SlAutolength((AutolengthProc *)SaveReal_GSDT, nullptr);
-}
+ void Save() const override
+ {
+ SlTableHeader(_game_script_desc);
+ SlSetArrayIndex(0);
+ SlAutolength((AutolengthProc *)SaveReal_GSDT, nullptr);
+ }
+};
extern GameStrings *_current_data;
@@ -152,44 +156,48 @@ static const SaveLoad _game_language_desc[] = {
SLEG_STRUCTLIST("strings", SlGameLanguageString),
};
-static void Load_GSTR()
-{
- const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat);
-
- delete _current_data;
- _current_data = new GameStrings();
+struct GSTRChunkHandler : ChunkHandler {
+ GSTRChunkHandler() : ChunkHandler('GSTR', CH_TABLE) {}
- while (SlIterateArray() != -1) {
- LanguageStrings ls;
- SlObject(&ls, slt);
- _current_data->raw_strings.push_back(std::move(ls));
- }
+ void Load() const override
+ {
+ const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat);
- /* If there were no strings in the savegame, set GameStrings to nullptr */
- if (_current_data->raw_strings.size() == 0) {
delete _current_data;
- _current_data = nullptr;
- return;
- }
+ _current_data = new GameStrings();
- _current_data->Compile();
- ReconsiderGameScriptLanguage();
-}
+ while (SlIterateArray() != -1) {
+ LanguageStrings ls;
+ SlObject(&ls, slt);
+ _current_data->raw_strings.push_back(std::move(ls));
+ }
-static void Save_GSTR()
-{
- SlTableHeader(_game_language_desc);
+ /* If there were no strings in the savegame, set GameStrings to nullptr */
+ if (_current_data->raw_strings.size() == 0) {
+ delete _current_data;
+ _current_data = nullptr;
+ return;
+ }
+
+ _current_data->Compile();
+ ReconsiderGameScriptLanguage();
+ }
+
+ void Save() const override
+ {
+ SlTableHeader(_game_language_desc);
- if (_current_data == nullptr) return;
+ if (_current_data == nullptr) return;
- for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
- SlSetArrayIndex(i);
- SlObject(&_current_data->raw_strings[i], _game_language_desc);
+ for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
+ SlSetArrayIndex(i);
+ SlObject(&_current_data->raw_strings[i], _game_language_desc);
+ }
}
-}
+};
-static const ChunkHandler GSTR{ 'GSTR', Save_GSTR, Load_GSTR, nullptr, nullptr, CH_TABLE };
-static const ChunkHandler GSDT{ 'GSDT', Save_GSDT, Load_GSDT, nullptr, nullptr, CH_TABLE };
+static const GSTRChunkHandler GSTR;
+static const GSDTChunkHandler GSDT;
static const ChunkHandlerRef game_chunk_handlers[] = {
GSTR,
GSDT,
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-09 06:52:51 +0000