lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clean up captions code to allow for different numbers defined at compile time.

Browse source
This commit is contained in:
toasterbabe 2017-04-17 18:15:42 +01:00
parent bec7a184f1
commit 08e7a7cb4d
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/s_sound.c
View file

@ -130,21 +130,12 @@ static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL
static channel_t *channels = NULL; static channel_t *channels = NULL;
static INT32 numofchannels = 0; static INT32 numofchannels = 0;
caption_t closedcaptions[8] = { caption_t closedcaptions[NUMCAPTIONS];
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0},
{NULL, NULL, 0}
};
void ResetCaptions(void) void ResetCaptions(void)
{ {
UINT8 i; UINT8 i;
for (i = 0; i < 8; i++) for (i = 0; i < NUMCAPTIONS; i++)
{ {
closedcaptions[i].c = NULL; closedcaptions[i].c = NULL;
closedcaptions[i].s = NULL; closedcaptions[i].s = NULL;
@ -593,7 +584,7 @@ dontplay:
// Handle closed caption input. // Handle closed caption input.
if (cv_closedcaptioning.value && sfx->caption[0] != '/') if (cv_closedcaptioning.value && sfx->caption[0] != '/')
{ {
UINT8 i, set = 7, moveup = 255; UINT8 i, set = NUMCAPTIONS-1, moveup = 255;
boolean same = false; boolean same = false;
for (i = 0; i < set; i++) for (i = 0; i < set; i++)
{ {
@ -617,7 +608,7 @@ dontplay:
break; break;
} }
} }
for (i = 7; i > set; i--) for (i = NUMCAPTIONS-1; i > set; i--)
{ {
if (sfx == closedcaptions[i].s) if (sfx == closedcaptions[i].s)
{ {
@ -630,7 +621,7 @@ dontplay:
if (moveup != 255) if (moveup != 255)
{ {
for (i = moveup; i < 7; i++) for (i = moveup; i < NUMCAPTIONS-1; i++)
{ {
if (!(closedcaptions[i].c || closedcaptions[i].s)) if (!(closedcaptions[i].c || closedcaptions[i].s))
break; break;

4
src/s_sound.h
View file

@ -85,7 +85,9 @@ typedef struct {
UINT8 t; UINT8 t;
} caption_t; } caption_t;
extern caption_t closedcaptions[8]; #define NUMCAPTIONS 8
extern caption_t closedcaptions[NUMCAPTIONS];
// register sound vars and commands at game startup // register sound vars and commands at game startup
void S_RegisterSoundStuff(void); void S_RegisterSoundStuff(void);

4
src/screen.c
View file

@ -442,7 +442,7 @@ void SCR_ClosedCaptions(void)
{ {
UINT8 i; UINT8 i;
for (i = 0; i < 8; i++) for (i = 0; i < NUMCAPTIONS; i++)
{ {
boolean cond = (closedcaptions[i].c && I_SoundIsPlaying(closedcaptions[i].c->handle)); boolean cond = (closedcaptions[i].c && I_SoundIsPlaying(closedcaptions[i].c->handle));
@ -462,7 +462,7 @@ void SCR_ClosedCaptions(void)
} }
} }
for (i = 0; i < 8; i++) for (i = 0; i < NUMCAPTIONS; i++)
{ {
if (closedcaptions[i].s) if (closedcaptions[i].s)
{ {