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

[hellfire] Allow continuing Diablo saves in Hellfire and vice versa

Browse source
This commit is contained in:
Anders Jenbo 2021-01-13 15:05:22 +01:00
commit 4ffbb32952
12 changed files with 183 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/pack.cpp
View file

@ -12,7 +12,11 @@ void PackItem(PkItemStruct *id, ItemStruct *is)
if (is->_itype == ITYPE_NONE) {
id->idx = 0xFFFF;
} else {
id->idx = SwapLE16(is->IDidx);
int idx = is->IDidx;
if (!gbIsHellfire) {
idx = RemapItemIdxToDiablo(idx);
}
id->idx = SwapLE16(idx);
if (is->IDidx == IDI_EAR) {
id->iCreateInfo = is->_iName[8] | (is->_iName[7] << 8);
id->iSeed = SwapLE32(is->_iName[12] | ((is->_iName[11] | ((is->_iName[10] | (is->_iName[9] << 8)) << 8)) << 8));
@ -132,6 +136,9 @@ void UnPackItem(PkItemStruct *is, ItemStruct *id)
if (idx == 0xFFFF) {
id->_itype = ITYPE_NONE;
} else {
if (!gbIsHellfireSaveGame) {
idx = RemapItemIdxFromDiablo(idx);
}
if (idx == IDI_EAR) {
RecreateEar(
MAXITEMS,