Merge branch 'master' into knuxstuff
This commit is contained in:
commit
92be187731
|
@ -7976,7 +7976,7 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
INT32 strength;
|
INT32 strength;
|
||||||
++mobj->movedir;
|
++mobj->movedir;
|
||||||
mobj->frame &= ~FF_TRANSMASK;
|
mobj->frame &= ~FF_TRANSMASK;
|
||||||
strength = min(mobj->fuse, mobj->movedir)*3;
|
strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
|
||||||
if (strength < 10)
|
if (strength < 10)
|
||||||
mobj->frame |= ((10-strength)<<(FF_TRANSSHIFT));
|
mobj->frame |= ((10-strength)<<(FF_TRANSSHIFT));
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,8 +118,8 @@ consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_O
|
||||||
consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// Window focus sound sytem toggles
|
// Window focus sound sytem toggles
|
||||||
consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo};
|
consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo};
|
consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
|
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
|
||||||
|
|
Loading…
Reference in New Issue