id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-22 09:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Applied Astyle

Browse source
This commit is contained in:
Robert Beckebans 2022-03-06 08:59:13 +01:00
parent d212e5b948
commit 2ce90cf97b
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES.md
View file

@ -64,6 +64,8 @@ This patch also contains a couple of func_group related bugfixes. func_group wor
[MISCELLANEOUS]
* Stencil shadows work again (thanks to Stephen Pridham)
* Added CMake options STANDALONE and DOOM_CLASSIC
* Added command convertMapQuakeToDoom `<map>` that expects a Quake 1 .map in the Valve220 format and does some Doom 3 specific fixes

10
neo/renderer/Cinematic.cpp
View file

@ -817,7 +817,7 @@ void idCinematicLocal::FFMPEGReset()
//startTime = 0;
framePos = -1;
// SRS - If we have an ffmpeg audio context and are not looping, or skipLag is true, reset audio to release any stale buffers
if( dec_ctx2 && ( !( looping && status == FMV_EOF ) || skipLag ) )
{
@ -934,7 +934,7 @@ bool idCinematicLocal::InitFromBinkDecFile( const char* qpath, bool amilooping )
void idCinematicLocal::BinkDecReset()
{
framePos = -1;
// SRS - If we have bink audio tracks, reset audio to release any stale buffers (even if looping)
if( audioTracks > 0 )
{
@ -989,7 +989,7 @@ bool idCinematicLocal::InitFromFile( const char* qpath, bool amilooping )
temp = fileName.StripFileExtension() + ".bik";
skipLag = false; // SRS - Enable lag buffer for ffmpeg bik decoder AV sync
// SRS - Support RoQ cinematic playback via ffmpeg decoder - better quality plus audio support
// SRS - Support RoQ cinematic playback via ffmpeg decoder - better quality plus audio support
}
else
{
@ -998,7 +998,7 @@ bool idCinematicLocal::InitFromFile( const char* qpath, bool amilooping )
skipLag = true; // SRS - Disable lag buffer for ffmpeg RoQ decoder AV sync
}
{
// SRS End
// SRS End
animationLength = 0;
fileName = temp;
@ -1084,7 +1084,7 @@ void idCinematicLocal::Close()
if( dec_ctx2 )
{
avcodec_free_context( &dec_ctx2 );
// SRS - Free resample context if we were decoding planar audio
if( swr_ctx )
{

2
neo/sound/OpenAL/AL_CinematicAudio.cpp
View file

@ -247,7 +247,7 @@ void CinematicAudio_OpenAL::ShutdownAudio()
{
alDeleteBuffers( NUM_BUFFERS, alMusicBuffercin );
}
while( !tBuffer.empty() )
{
uint8_t* tempdata = tBuffer.front();