MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Validate player sync

Browse source
This commit is contained in:
Anders Jenbo 2021-10-09 16:22:53 +02:00
commit a56452eec3
7 changed files with 73 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/pfile.cpp
View file

@ -300,15 +300,15 @@ bool pfile_ui_set_hero_infos(bool (*uiAddHeroInfo)(_uiheroinfo *))
pkplr.bIsHellfire = gbIsHellfireSaveGame ? 1 : 0;
auto &player = Players[0];
UnPackPlayer(&pkplr, player, false);
CloseArchive(&archive);
LoadHeroItems(player);
RemoveEmptyInventory(player);
CalcPlrInv(player, false);
if (UnPackPlayer(&pkplr, player, false)) {
LoadHeroItems(player);
RemoveEmptyInventory(player);
CalcPlrInv(player, false);
Game2UiPlayer(player, &uihero, hasSaveGame);
uiAddHeroInfo(&uihero);
Game2UiPlayer(player, &uihero, hasSaveGame);
uiAddHeroInfo(&uihero);
}
}
CloseArchive(&archive);
}
@ -392,7 +392,9 @@ void pfile_read_player_from_save(uint32_t saveNum, Player &player)
CloseArchive(&archive);
UnPackPlayer(&pkplr, player, false);
if (!UnPackPlayer(&pkplr, player, false)) {
return;
}
LoadHeroItems(player);
RemoveEmptyInventory(player);