comparison src/adplug/core/rol.cxx @ 870:028350cb60b1 trunk

[svn] - in C++, using __null/NULL is improper. 0 should be used instead. - guard against double-deletes

869:48ebfc711a8c

      pitchCache[n]=1.0f;    
}
//---------------------------------------------------------
CrolPlayer::~CrolPlayer()
{
    if( rol_header != NULL )
    {
        delete rol_header;
        rol_header=NULL;
    }
}
//---------------------------------------------------------
bool CrolPlayer::load(VFSFile *fd, const CFileProvider &fp)
{

    for (i=strlen(fn)-1; i>=0; i--)
      if (fn[i] == '/' || fn[i] == '\\')
	break;
    strcpy(fn+i+1,"standard.bnk");
    bnk_filename = fn;
    delete [] fn;
    AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename.c_str());

    rol_header = new SRolHeader;
    memset( rol_header, 0, sizeof(SRolHeader) );

870:028350cb60b1

      pitchCache[n]=1.0f;    
}
//---------------------------------------------------------
CrolPlayer::~CrolPlayer()
{
    if(rol_header)
    {
        delete rol_header;
        rol_header = 0;
    }
}
//---------------------------------------------------------
bool CrolPlayer::load(VFSFile *fd, const CFileProvider &fp)
{

    for (i=strlen(fn)-1; i>=0; i--)
      if (fn[i] == '/' || fn[i] == '\\')
	break;
    strcpy(fn+i+1,"standard.bnk");
    bnk_filename = fn;
    delete [] fn; fn = 0;
    AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename.c_str());

    rol_header = new SRolHeader;
    memset( rol_header, 0, sizeof(SRolHeader) );