Skip to content

Commit

Permalink
Undo sequence playing hack.
Browse files Browse the repository at this point in the history
Caused a few sequences for Alpha campaign to freeze until clicked on.
  • Loading branch information
KJeff01 committed Jan 29, 2018
1 parent 7accb0e commit c89320c
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions lib/sequence/sequence.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,6 @@ static GLfloat Scrnvidpos[3];

static SCANLINE_MODE use_scanlines;

//HACK: This is used to play a sequence where audio/video is not synced fast enough.
static int playAttempts = 0;

// Helper; just grab some more compressed bitstream and sync it for page extraction
static int buffer_data(PHYSFS_file *in, ogg_sync_state *oy)
{
Expand Down Expand Up @@ -809,7 +806,6 @@ bool seq_Update()
else
{
/* we need more data; break out to suck in another page */
playAttempts += 1;
break;
}
}
Expand Down Expand Up @@ -850,11 +846,9 @@ bool seq_Update()
alGetSourcei(audiodata.source, AL_SOURCE_STATE, &sourcestate);

if (PHYSFS_eof(fpInfile)
&& playAttempts > 2
&& !videobuf_ready
&& ((!audiobuf_ready && (audiodata.audiobuf_fill == 0)) || audio_Disabled())
&& sourcestate != AL_PLAYING
)
&& sourcestate != AL_PLAYING)
{
video_write(false);
seq_Shutdown();
Expand Down Expand Up @@ -956,7 +950,6 @@ void seq_Shutdown()
}

videoplaying = false;
playAttempts = 0;
Timer_stop();

audioTime = 0;
Expand Down

0 comments on commit c89320c

Please sign in to comment.