Browse Source

Ensure AnimationInfo is reset when a game is loaded

pull/2163/head
obligaron 5 years ago committed by Anders Jenbo
parent
commit
660f8d2f43
  1. 2
      Source/loadsave.cpp

2
Source/loadsave.cpp

@ -217,6 +217,7 @@ static void LoadItemData(LoadHelper *file, ItemStruct *pItem)
pItem->position.y = file->nextLE<int32_t>(); pItem->position.y = file->nextLE<int32_t>();
pItem->_iAnimFlag = file->nextBool32(); pItem->_iAnimFlag = file->nextBool32();
file->skip(4); // Skip pointer _iAnimData file->skip(4); // Skip pointer _iAnimData
pItem->AnimInfo = {};
pItem->AnimInfo.NumberOfFrames = file->nextLE<int32_t>(); pItem->AnimInfo.NumberOfFrames = file->nextLE<int32_t>();
pItem->AnimInfo.CurrentFrame = file->nextLE<int32_t>(); pItem->AnimInfo.CurrentFrame = file->nextLE<int32_t>();
file->skip(8); // Skip _iAnimWidth and _iAnimWidth2 file->skip(8); // Skip _iAnimWidth and _iAnimWidth2
@ -337,6 +338,7 @@ static void LoadPlayer(LoadHelper *file, int p)
file->skip(4); // Unused file->skip(4); // Unused
player._pgfxnum = file->nextLE<int32_t>(); player._pgfxnum = file->nextLE<int32_t>();
file->skip(4); // Skip pointer pData file->skip(4); // Skip pointer pData
player.AnimInfo = {};
player.AnimInfo.DelayLen = file->nextLE<int32_t>(); player.AnimInfo.DelayLen = file->nextLE<int32_t>();
player.AnimInfo.DelayCounter = file->nextLE<int32_t>(); player.AnimInfo.DelayCounter = file->nextLE<int32_t>();
player.AnimInfo.NumberOfFrames = file->nextLE<int32_t>(); player.AnimInfo.NumberOfFrames = file->nextLE<int32_t>();

Loading…
Cancel
Save