From 045b2e12f2fe712a78e76579309eff8a2cd99d03 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 9 May 2020 12:08:24 -0700 Subject: [PATCH] ULTIMA4: Cleanup & clarification of savegame position fields --- .../ultima4/controllers/intro_controller.cpp | 5 ++- engines/ultima/ultima4/filesys/savegame.cpp | 44 ++++++++----------- engines/ultima/ultima4/filesys/savegame.h | 7 +-- 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/engines/ultima/ultima4/controllers/intro_controller.cpp b/engines/ultima/ultima4/controllers/intro_controller.cpp index dfc9db233b1..7d9ec9ab3ef 100644 --- a/engines/ultima/ultima4/controllers/intro_controller.cpp +++ b/engines/ultima/ultima4/controllers/intro_controller.cpp @@ -1320,8 +1320,9 @@ void IntroController::initPlayers(SaveGame *saveGame) { saveGame->_players[0]._weapon = initValuesForClass[saveGame->_players[0]._class].weapon; saveGame->_players[0]._armor = initValuesForClass[saveGame->_players[0]._class].armor; saveGame->_players[0]._xp = initValuesForClass[saveGame->_players[0]._class].xp; - saveGame->_x = initValuesForClass[saveGame->_players[0]._class].x; - saveGame->_y = initValuesForClass[saveGame->_players[0]._class].y; + saveGame->_pos.x = initValuesForClass[saveGame->_players[0]._class].x; + saveGame->_pos.y = initValuesForClass[saveGame->_players[0]._class].y; + saveGame->_pos.z = 0; saveGame->_players[0]._str = 15; saveGame->_players[0]._dex = 15; diff --git a/engines/ultima/ultima4/filesys/savegame.cpp b/engines/ultima/ultima4/filesys/savegame.cpp index a16e39fd4dc..68d06941203 100644 --- a/engines/ultima/ultima4/filesys/savegame.cpp +++ b/engines/ultima/ultima4/filesys/savegame.cpp @@ -39,19 +39,15 @@ void SaveGame::save(Common::WriteStream *stream) { Common::Serializer ser(nullptr, stream); assert(g_context && g_context->_location); - if (g_context->_location->_prev) { - _x = g_context->_location->_coords.x; - _y = g_context->_location->_coords.y; - _dngLevel = g_context->_location->_coords.z; - _dngX = g_context->_location->_prev->_coords.x; - _dngY = g_context->_location->_prev->_coords.y; - } else { - _x = g_context->_location->_coords.x; - _y = g_context->_location->_coords.y; - _dngLevel = g_context->_location->_coords.z; - } - _location = g_context->_location->_map->_id; + _pos = g_context->_location->_coords; + + if (g_context->_location->_prev) { + _overworldPos.x = g_context->_location->_prev->_coords.x; + _overworldPos.y = g_context->_location->_prev->_coords.y; + } else { + _overworldPos.x = _overworldPos.y = 0; + } synchronize(ser); @@ -125,10 +121,10 @@ void SaveGame::load(Common::SeekableReadStream *stream) { * Translate info from the savegame to something we can use */ if (g_context->_location->_prev) { - g_context->_location->_coords = MapCoords(_x, _y, _dngLevel); - g_context->_location->_prev->_coords = MapCoords(_dngX, _dngY); + g_context->_location->_coords = _pos; + g_context->_location->_prev->_coords = MapCoords(_overworldPos.x, _overworldPos.y, 0); } else { - g_context->_location->_coords = MapCoords(_x, _y, (int)_dngLevel); + g_context->_location->_coords = _pos; } /** @@ -205,8 +201,12 @@ void SaveGame::synchronize(Common::Serializer &s) { s.syncAsUint16LE(_mixtures[i]); s.syncAsUint16LE(_items); - s.syncAsByte(_x); - s.syncAsByte(_y); + s.syncAsByte(_pos.x); + s.syncAsByte(_pos.y); + s.syncAsUint16LE(_pos.z); + s.syncAsByte(_overworldPos.x); + s.syncAsByte(_overworldPos.y); + s.syncAsByte(_stones); s.syncAsByte(_runes); s.syncAsUint16LE(_members); @@ -220,10 +220,7 @@ void SaveGame::synchronize(Common::Serializer &s) { s.syncAsUint16LE(_lastReagent); s.syncAsUint16LE(_lastMeditation); s.syncAsUint16LE(_lastVirtue); - s.syncAsByte(_dngX); - s.syncAsByte(_dngY); s.syncAsUint16LE(_orientation); - s.syncAsUint16LE(_dngLevel); s.syncAsUint16LE(_location); } @@ -261,8 +258,8 @@ void SaveGame::init(const SaveGamePlayerRecord *avatarInfo) { _mixtures[i] = 0; _items = 0; - _x = 0; - _y = 0; + _pos = Coords(0, 0, 0xffff); + _overworldPos = Common::Point(); _stones = 0; _runes = 0; _members = 1; @@ -276,10 +273,7 @@ void SaveGame::init(const SaveGamePlayerRecord *avatarInfo) { _lastReagent = 0; _lastMeditation = 0; _lastVirtue = 0; - _dngX = 0; - _dngY = 0; _orientation = 0; - _dngLevel = 0xFFFF; _location = 0; } diff --git a/engines/ultima/ultima4/filesys/savegame.h b/engines/ultima/ultima4/filesys/savegame.h index 72c6623e79b..a404ecaa105 100644 --- a/engines/ultima/ultima4/filesys/savegame.h +++ b/engines/ultima/ultima4/filesys/savegame.h @@ -23,8 +23,10 @@ #ifndef ULTIMA4_FILESYS_SAVEGAME_H #define ULTIMA4_FILESYS_SAVEGAME_H +#include "common/rect.h" #include "common/stream.h" #include "common/serializer.h" +#include "ultima/ultima4/core/coords.h" namespace Ultima { namespace Ultima4 { @@ -269,7 +271,8 @@ struct SaveGame { short _reagents[REAG_MAX]; short _mixtures[SPELL_MAX]; unsigned short _items; - byte _x, _y; + Coords _pos; + Common::Point _overworldPos; byte _stones; byte _runes; unsigned short _members; @@ -286,9 +289,7 @@ struct SaveGame { unsigned short _lastReagent; unsigned short _lastMeditation; unsigned short _lastVirtue; - byte _dngX, _dngY; unsigned short _orientation; - unsigned short _dngLevel; unsigned short _location; };