Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alam Ed Arias 2020-01-16 20:17:05 -05:00
commit daab7a0d21
1 changed files with 1 additions and 2 deletions

View File

@ -120,8 +120,7 @@ consvar_t cv_resetmusicbyheader = {"resetmusicbyheader", "Yes", CV_SAVE, CV_YesN
static CV_PossibleValue_t cons_1upsound_t[] = {
{0, "Jingle"},
{1, "Sound"},
{0}
{0, NULL}
};
consvar_t cv_1upsound = {"1upsound", "Jingle", CV_SAVE, cons_1upsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};