rename variables named Status to status to prevent collision with X11
This commit is contained in:
parent
d1ba86a638
commit
eabd6e015c
|
@ -1851,9 +1851,9 @@ void SCR_RunCinematic (void)
|
|||
CL_CheckPendingCinematic();
|
||||
|
||||
if (CL_handle >= 0 && CL_handle < MAX_VIDEO_HANDLES) {
|
||||
e_status Status = CIN_RunCinematic(CL_handle);
|
||||
e_status status = CIN_RunCinematic(CL_handle);
|
||||
|
||||
if (CL_IsRunningInGameCinematic() && Status == FMV_IDLE && !cinTable[CL_handle].holdAtEnd)
|
||||
if (CL_IsRunningInGameCinematic() && status == FMV_IDLE && !cinTable[CL_handle].holdAtEnd)
|
||||
{
|
||||
SCR_StopCinematic(); // change ROQ from FMV_IDLE to FMV_EOF, and clear some other vars
|
||||
}
|
||||
|
|
|
@ -471,7 +471,7 @@ void S_Init( void ) {
|
|||
for (j = 0; j < NUM_STREAMING_BUFFERS; j++)
|
||||
{
|
||||
alGenBuffers(1, &(ch->buffers[j].BufferID));
|
||||
ch->buffers[j].Status = UNQUEUED;
|
||||
ch->buffers[j].status = UNQUEUED;
|
||||
ch->buffers[j].Data = (char *)Z_Malloc(STREAMING_BUFFER_SIZE, TAG_SND_RAWDATA, qfalse);
|
||||
}
|
||||
}
|
||||
|
@ -591,7 +591,7 @@ void S_Shutdown( void )
|
|||
{
|
||||
alDeleteBuffers(1, &(ch->buffers[j].BufferID));
|
||||
ch->buffers[j].BufferID = 0;
|
||||
ch->buffers[j].Status = UNQUEUED;
|
||||
ch->buffers[j].status = UNQUEUED;
|
||||
if (ch->buffers[j].Data)
|
||||
{
|
||||
Z_Free(ch->buffers[j].Data);
|
||||
|
@ -2677,7 +2677,7 @@ void S_Update_(void) {
|
|||
|
||||
// Reset streaming buffers status's
|
||||
for (i = 0; i < NUM_STREAMING_BUFFERS; i++)
|
||||
ch->buffers[i].Status = UNQUEUED;
|
||||
ch->buffers[i].status = UNQUEUED;
|
||||
|
||||
// Decode (STREAMING_BUFFER_SIZE / 1152) MP3 frames for each of the NUM_STREAMING_BUFFERS AL Buffers
|
||||
for (i = 0; i < NUM_STREAMING_BUFFERS; i++)
|
||||
|
@ -2730,7 +2730,7 @@ void S_Update_(void) {
|
|||
alSourceQueueBuffers(s_channels[source].alSource, 1, &(ch->buffers[i].BufferID));
|
||||
if (alGetError() == AL_NO_ERROR)
|
||||
{
|
||||
ch->buffers[i].Status = QUEUED;
|
||||
ch->buffers[i].status = QUEUED;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2896,7 +2896,7 @@ void UpdateSingleShotSounds()
|
|||
{
|
||||
if (ch->buffers[j].BufferID == buffer)
|
||||
{
|
||||
ch->buffers[j].Status = UNQUEUED;
|
||||
ch->buffers[j].status = UNQUEUED;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -2907,7 +2907,7 @@ void UpdateSingleShotSounds()
|
|||
|
||||
for (j = 0; j < NUM_STREAMING_BUFFERS; j++)
|
||||
{
|
||||
if ((ch->buffers[j].Status == UNQUEUED) & (ch->MP3StreamHeader.iSourceBytesRemaining > 0))
|
||||
if ((ch->buffers[j].status == UNQUEUED) & (ch->MP3StreamHeader.iSourceBytesRemaining > 0))
|
||||
{
|
||||
nTotalBytesDecoded = 0;
|
||||
|
||||
|
@ -2956,7 +2956,7 @@ void UpdateSingleShotSounds()
|
|||
alSourceQueueBuffers(ch->alSource, 1, &(ch->buffers[j].BufferID));
|
||||
|
||||
// Update status of Buffer
|
||||
ch->buffers[j].Status = QUEUED;
|
||||
ch->buffers[j].status = QUEUED;
|
||||
|
||||
break;
|
||||
}
|
||||
|
@ -2969,7 +2969,7 @@ void UpdateSingleShotSounds()
|
|||
alSourceQueueBuffers(ch->alSource, 1, &(ch->buffers[j].BufferID));
|
||||
|
||||
// Update status of Buffer
|
||||
ch->buffers[j].Status = QUEUED;
|
||||
ch->buffers[j].status = QUEUED;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ typedef struct {
|
|||
typedef struct
|
||||
{
|
||||
ALuint BufferID;
|
||||
ALuint Status;
|
||||
ALuint status;
|
||||
char *Data;
|
||||
} STREAMINGBUFFER;
|
||||
|
||||
|
|
Loading…
Reference in New Issue