Reset player object before unpacking hero data

This commit is contained in:
Anders Jenbo 2021-10-12 04:35:30 +02:00
commit eb3012cc0d
2 changed files with 5 additions and 0 deletions

View file

@ -301,6 +301,8 @@ bool pfile_ui_set_hero_infos(bool (*uiAddHeroInfo)(_uiheroinfo *))
auto &player = Players[0];
player = {};
if (UnPackPlayer(&pkplr, player, false)) {
LoadHeroItems(player);
RemoveEmptyInventory(player);
@ -380,6 +382,8 @@ void pfile_read_player_from_save(uint32_t saveNum, Player &player)
HANDLE archive;
PlayerPack pkplr;
player = {};
archive = OpenSaveArchive(saveNum);
if (archive == nullptr)
app_fatal("%s", _("Unable to open archive"));

View file

@ -334,6 +334,7 @@ TEST(Writehero, pfile_write_hero)
MyPlayerId = 0;
MyPlayer = &Players[MyPlayerId];
*MyPlayer = {};
_uiheroinfo info {};
strcpy(info.name, "TestPlayer");