mirrors/re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #453 from Fire-Head/master

Browse Source 
Removed refs from sampman
This commit is contained in:
Fire_Head 2020-04-16 08:38:23 +03:00 committed by GitHub
commit 49bef1cc63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/audio/sampman.cpp
View File

@ -17,9 +17,8 @@
#pragma comment( lib, "mss32.lib" ) #pragma comment( lib, "mss32.lib" )
cSampleManager &SampleManager = *(cSampleManager *)0x7341E0; cSampleManager SampleManager;
extern int32 (&BankStartOffset)[MAX_SAMPLEBANKS] = *(int32 (*)[MAX_SAMPLEBANKS])*(int *)0x6FAB70; int32 BankStartOffset[MAX_SAMPLEBANKS];
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
char SampleBankDescFilename[] = "AUDIO\\SFX.SDT"; char SampleBankDescFilename[] = "AUDIO\\SFX.SDT";
@ -116,7 +115,7 @@ typedef struct provider_stuff
static int __cdecl comp(const provider_stuff*s1,const provider_stuff*s2) static int __cdecl comp(const provider_stuff*s1,const provider_stuff*s2)
{ {
return(strcasecmp(s1->name, s2->name)); return( _stricmp(s1->name,s2->name) );
} }
static void static void
@ -435,21 +434,17 @@ _FindMP3s(void)
OutputDebugString("Resolving Link"); OutputDebugString("Resolving Link");
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - shortcut to \"%s\"", filepath);
fprintf(f, " - shortcut to \"%s\"", filepath);
} }
else else
{ {
if ( f ) if ( f ) fprintf(f, " - couldn't resolve shortcut");
fprintf(f, " - couldn't resolve shortcut");
} }
bShortcut = true; bShortcut = true;
} }
else else
{
bShortcut = false; bShortcut = false;
}
} }
mp3Stream[0] = AIL_open_stream(DIG, filepath, 0); mp3Stream[0] = AIL_open_stream(DIG, filepath, 0);
@ -494,8 +489,7 @@ _FindMP3s(void)
_pMP3List->pLinkPath = NULL; _pMP3List->pLinkPath = NULL;
} }
if ( f ) if ( f ) fprintf(f, " - OK\n");
fprintf(f, " - OK\n");
bInitFirstEntry = false; bInitFirstEntry = false;
} }
@ -505,8 +499,7 @@ _FindMP3s(void)
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - not an MP3 or supported MP3 type\n");
fprintf(f, " - not an MP3 or supported MP3 type\n");
bInitFirstEntry = true; bInitFirstEntry = true;
} }
@ -514,17 +507,7 @@ _FindMP3s(void)
while ( true ) while ( true )
{ {
if ( !FindNextFile(hFind, &fd) ) if ( !FindNextFile(hFind, &fd) )
{ break;
if ( f )
{
fprintf(f, "\nTOTAL SUPPORTED MP3s: %d\n", nNumMP3s);
fclose(f);
}
FindClose(hFind);
return;
}
if ( bInitFirstEntry ) if ( bInitFirstEntry )
{ {
@ -533,8 +516,7 @@ _FindMP3s(void)
int32 filepathlen = strlen(filepath); int32 filepathlen = strlen(filepath);
if ( f ) if ( f ) fprintf(f, "\"%s\"", fd.cFileName);
fprintf(f, "\"%s\"", fd.cFileName);
if ( filepathlen > 0 ) if ( filepathlen > 0 )
{ {
@ -547,13 +529,11 @@ _FindMP3s(void)
OutputDebugString("Resolving Link"); OutputDebugString("Resolving Link");
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - shortcut to \"%s\"", filepath);
fprintf(f, " - shortcut to \"%s\"", filepath);
} }
else else
{ {
if ( f ) if ( f ) fprintf(f, " - couldn't resolve shortcut");
fprintf(f, " - couldn't resolve shortcut");
} }
bShortcut = true; bShortcut = true;
@ -564,8 +544,7 @@ _FindMP3s(void)
if ( filepathlen > MAX_PATH ) if ( filepathlen > MAX_PATH )
{ {
if ( f ) if ( f ) fprintf(f, " - Filename and path too long - %s - IGNORED)\n", filepath);
fprintf(f, " - Filename and path too long - %s - IGNORED)\n", filepath);
continue; continue;
} }
@ -585,15 +564,7 @@ _FindMP3s(void)
_pMP3List = new tMP3Entry; _pMP3List = new tMP3Entry;
if ( _pMP3List == NULL) if ( _pMP3List == NULL)
{ break;
if ( f )
{
fprintf(f, "\nTOTAL SUPPORTED MP3s: %d\n", nNumMP3s);
fclose(f);
}
FindClose(hFind);
return;
}
nNumMP3s = 1; nNumMP3s = 1;
@ -614,8 +585,7 @@ _FindMP3s(void)
pList = _pMP3List; pList = _pMP3List;
if ( f ) if ( f ) fprintf(f, " - OK\n");
fprintf(f, " - OK\n");
bInitFirstEntry = false; bInitFirstEntry = false;
} }
@ -624,8 +594,7 @@ _FindMP3s(void)
strcat(filepath, " - NOT A VALID MP3"); strcat(filepath, " - NOT A VALID MP3");
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - not an MP3 or supported MP3 type\n");
fprintf(f, " - not an MP3 or supported MP3 type\n");
} }
} }
} }
@ -638,8 +607,7 @@ _FindMP3s(void)
if ( filepathlen > 0 ) if ( filepathlen > 0 )
{ {
if ( f ) if ( f ) fprintf(f, "\"%s\"", fd.cFileName);
fprintf(f, "\"%s\"", fd.cFileName);
if ( filepathlen > 4 ) if ( filepathlen > 4 )
{ {
@ -650,13 +618,11 @@ _FindMP3s(void)
OutputDebugString("Resolving Link"); OutputDebugString("Resolving Link");
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - shortcut to \"%s\"", filepath);
fprintf(f, " - shortcut to \"%s\"", filepath);
} }
else else
{ {
if ( f ) if ( f ) fprintf(f, " - couldn't resolve shortcut");
fprintf(f, " - couldn't resolve shortcut");
} }
bShortcut = true; bShortcut = true;
@ -679,16 +645,8 @@ _FindMP3s(void)
tMP3Entry *e = pList->pNext; tMP3Entry *e = pList->pNext;
if ( e == NULL) if ( e == NULL )
{ break;
if ( f )
{
fprintf(f, "\nTOTAL SUPPORTED MP3s: %d\n", nNumMP3s);
fclose(f);
}
FindClose(hFind);
return;
}
pList = pList->pNext; pList = pList->pNext;
@ -710,20 +668,26 @@ _FindMP3s(void)
OutputDebugString(fd.cFileName); OutputDebugString(fd.cFileName);
if ( f ) if ( f ) fprintf(f, " - OK\n");
fprintf(f, " - OK\n");
} }
else else
{ {
strcat(filepath, " - NOT A VALID MP3"); strcat(filepath, " - NOT A VALID MP3");
OutputDebugString(filepath); OutputDebugString(filepath);
if ( f ) if ( f ) fprintf(f, " - not an MP3 or supported MP3 type\n");
fprintf(f, " - not an MP3 or supported MP3 type\n");
} }
} }
} }
} }
if ( f )
{
fprintf(f, "\nTOTAL SUPPORTED MP3s: %d\n", nNumMP3s);
fclose(f);
}
FindClose(hFind);
} }
static void static void
@ -2257,7 +2221,7 @@ cSampleManager::InitialiseSampleBanks(void)
for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ ) for ( int32 i = 0; i < TOTAL_AUDIO_SAMPLES; i++ )
{ {
if ( BankStartOffset[nBank] == BankStartOffset[0] + i ) if ( BankStartOffset[nBank] == BankStartOffset[SAMPLEBANK_MAIN] + i )
{ {
nSampleBankDiscStartOffset[nBank] = m_aSamples[i].nOffset; nSampleBankDiscStartOffset[nBank] = m_aSamples[i].nOffset;
nBank++; nBank++;

4
src/audio/sampman.h
View File

@ -135,8 +135,8 @@ public:
bool InitialiseSampleBanks(void); bool InitialiseSampleBanks(void);
}; };
extern cSampleManager &SampleManager; extern cSampleManager SampleManager;
extern int32 (&BankStartOffset)[MAX_SAMPLEBANKS]; extern int32 BankStartOffset[MAX_SAMPLEBANKS];
static char StreamedNameTable[][25]= static char StreamedNameTable[][25]=
{ {