X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvgmsnd%2FvgmSnd.c;h=c46b0b76a6e9d561a89ed502135fadb6ea3b5dd2;hb=a345aeee10a2177753f93c6ccc1be926975ef73e;hp=2cfd8690c36a008a07cdd7df39d383de07a833f9;hpb=adb425e17c32e33e71670dd69c909717f1d65acb;p=16.git diff --git a/src/lib/vgmsnd/vgmSnd.c b/src/lib/vgmsnd/vgmSnd.c index 2cfd8690..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); +#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,12 +219,15 @@ 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); - if(vgmFile->data) free(vgmFile->data); +#endif +// if(vgmFile->data) free(vgmFile->data); vgmFile->dataLen = 0; -// return; + return; }