a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 12:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/control/Record.cpp
#	src/vehicles/Automobile.cpp
This commit is contained in:
Sergeanur 2020-07-17 13:53:11 +03:00
parent ebdc5cca7f 949d0c8853
commit de8759eabd
4 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/audio/sampman_miles.cpp
View file

@ -1012,6 +1012,15 @@ cSampleManager::Initialise(void)
} }
#ifdef AUDIO_CACHE
TRACE("cache");
FILE *cacheFile = fopen("audio\\sound.cache", "rb");
if (cacheFile) {
fread(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
fclose(cacheFile);
m_bInitialised = true;
}else {
#endif
TRACE("cdrom"); TRACE("cdrom");
S32 tatalms; S32 tatalms;
@ -1168,6 +1177,12 @@ cSampleManager::Initialise(void)
_bUseHDDAudio = false; _bUseHDDAudio = false;
} }
#endif #endif
#ifdef AUDIO_CACHE
cacheFile = fopen("audio\\sound.cache", "wb");
fwrite(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
fclose(cacheFile);
}
#endif
TRACE("stream"); TRACE("stream");
{ {

13
src/audio/sampman_oal.cpp
View file

@ -604,7 +604,13 @@ cSampleManager::Initialise(void)
return false; return false;
} }
} }
#ifdef AUDIO_CACHE
FILE *cacheFile = fopen("audio\\sound.cache", "rb");
if (cacheFile) {
fread(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
fclose(cacheFile);
} else
#endif
{ {
for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ ) for ( int32 i = 0; i < TOTAL_STREAMED_SOUNDS; i++ )
@ -622,6 +628,11 @@ cSampleManager::Initialise(void)
else else
USERERROR("Can't open '%s'\n", StreamedNameTable[i]); USERERROR("Can't open '%s'\n", StreamedNameTable[i]);
} }
#ifdef AUDIO_CACHE
cacheFile = fopen("audio\\sound.cache", "wb");
fwrite(nStreamLength, sizeof(uint32), TOTAL_STREAMED_SOUNDS, cacheFile);
fclose(cacheFile);
#endif
} }
LoadSampleBank(SAMPLEBANK_MAIN); LoadSampleBank(SAMPLEBANK_MAIN);

2
src/core/FileLoader.cpp
View file

@ -106,7 +106,9 @@ CFileLoader::LoadLevel(const char *filename)
LoadingScreenLoadingFile(line + 4); LoadingScreenLoadingFile(line + 4);
LoadScene(line + 4); LoadScene(line + 4);
}else if(strncmp(line, "SPLASH", 6) == 0){ }else if(strncmp(line, "SPLASH", 6) == 0){
#ifndef DISABLE_LOADING_SCREEN
LoadSplash(GetRandomSplashScreen()); LoadSplash(GetRandomSplashScreen());
#endif
}else if(strncmp(line, "CDIMAGE", 7) == 0){ }else if(strncmp(line, "CDIMAGE", 7) == 0){
CdStreamAddImage(line + 8); CdStreamAddImage(line + 8);
} }

3
src/core/config.h
View file

@ -289,3 +289,6 @@ enum Config {
// Camera // Camera
#define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future #define IMPROVED_CAMERA // Better Debug cam, and maybe more in the future
#define FREE_CAM // Rotating cam #define FREE_CAM // Rotating cam
// Audio
#define AUDIO_CACHE // cache sound lengths to speed up the cold boot