X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvgmsnd%2FvgmSnd.c;h=c46b0b76a6e9d561a89ed502135fadb6ea3b5dd2;hb=HEAD;hp=d41f2abea3a0a9381e4f4e34c5e75d00b2a4e4ce;hpb=5b7cb93f7c6a5a008302efff5f68023005a4daaf;p=16.git diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c index d41f2abe..c46b0b76 100755 --- a/src/lib/vgmsnd/vgmSnd.c +++ b/src/lib/vgmsnd/vgmSnd.c @@ -171,9 +171,12 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile, global_game_variables } vgmFile->dataLen = vgmBaseHdr.lngEOFOffset + 0x04; - //vgmFile->data = (UINT8*)malloc(vgmFile->dataLen); - MM_GetPtr(MEMPTR gvar->ca.audiosegs[0], vgmFile->dataLen, gvar); +#ifndef VGM_USESCAMMPM + vgmFile->data = (UINT8*)malloc(vgmFile->dataLen); +#else + MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0], vgmFile->dataLen, gvar); vgmFile->data = (UINT8*)gvar->ca.audiosegs[0]; +#endif if (vgmFile->data == NULL) { fclose(hFile); @@ -216,9 +219,12 @@ UINT8 OpenVGMFile(const char* FileName, VGM_FILE* vgmFile, global_game_variables void FreeVGMFile(VGM_FILE* vgmFile, global_game_variables_t *gvar) { - //if(vgmFile->data){ free(vgmFile->data); vgmFile->data = NULL; } +#ifndef VGM_USESCAMMPM + if(vgmFile->data){ free(vgmFile->data); vgmFile->data = NULL; } +#else + MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar); +#endif // if(vgmFile->data) free(vgmFile->data); - MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar); vgmFile->dataLen = 0; return;