kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix allocation bugs

Browse source
This commit is contained in:
dbalatoni13 2025-04-17 21:03:20 +02:00
parent 5b365a049b
commit 75db73201a
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/hsfman.c
View file

@ -293,10 +293,13 @@ void Hu3DAllKill(void) {
Hu3DCameraAllKill();
Hu3DLightAllKill();
Hu3DAnimAllKill();
#if __MWERKS__
// this causes anim to be reallocated, so we lose the old allocation
if(reflectAnim[0] != (AnimData *)refMapData0) {
HuMemDirectFree(reflectAnim[0]);
}
reflectAnim[0] = HuSprAnimRead(refMapData0);
#endif
if(Hu3DShadowData.unk_04) {
HuMemDirectFree(Hu3DShadowData.unk_04);
Hu3DShadowCamBit = 0;

11
src/game/sprman.c
View file

@ -225,6 +225,7 @@ AnimData *HuSprAnimRead(void *data)
AnimData *anim = (AnimData *)data;
#endif
if((uintptr_t)anim->bank & ~0xFFFF) {
// TODO PC it's a problem if we get here, we need to find a way to not allocate again in that case
anim->useNum++;
return anim;
}
@ -649,6 +650,15 @@ AnimData *HuSprAnimMake(s16 sizeX, s16 sizeY, s16 dataFmt)
AnimBankData *bank;
AnimData *new_anim;
#ifdef TARGET_PC
// as these are allocated in HuSprAnimRead, we need to do so here too so we don't get issues when freeing
anim = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimData));
anim->bank = bank = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimBankData));
bank->frame = frame = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimFrameData));
anim->pat = pat = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimPatData));
pat->layer = layer = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimLayerData));
anim->bmp = bmp = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimBmpData));
#else
anim = new_anim = HuMemDirectMalloc(HEAP_DATA, sizeof(AnimData)+sizeof(AnimBankData)+sizeof(AnimFrameData)
+sizeof(AnimPatData)+sizeof(AnimLayerData)+sizeof(AnimBmpData));
@ -662,6 +672,7 @@ AnimData *HuSprAnimMake(s16 sizeX, s16 sizeY, s16 dataFmt)
pat->layer = layer;
bmp = temp = ((char *)temp+sizeof(AnimLayerData));
anim->bmp = bmp;
#endif
anim->useNum = 0;
anim->bankNum = 1;
anim->patNum = 1;