midi music bros
This commit is contained in:
1 parent
ad252fdbf2
commit
ad8cdc676c
2 files changed
+50
-31
No files matched your search
@@ -208,7 +208,6 @@ static inline void *G_ScpyTiccmd(ticcmd_t* dest, void* src, const size_t n)
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Some software don't support largest packet
|
||||
// (original sersetup, not exactely, but the probability of sending a packet
|
||||
// of 512 bytes is like 0.1)
|
||||
|
||||
+50
-30
@@ -1524,14 +1524,14 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
|
||||
NULL, "Music Volume", &cv_digmusicvolume, 38},
|
||||
|
||||
/* -- :nonnathisshit:
|
||||
#ifndef NO_MIDI
|
||||
{IT_STRING|IT_CVAR, NULL, "MIDI", &cv_gamemidimusic, 50},
|
||||
{IT_STRING|IT_CVAR|IT_CV_SLIDER,
|
||||
NULL, "MIDI Volume", &cv_midimusicvolume, 58},
|
||||
*/
|
||||
#endif
|
||||
|
||||
//{IT_STRING|IT_CALL, NULL, "Restart Audio System", M_RestartAudio, 50},
|
||||
|
||||
#ifdef NO_MIDI
|
||||
{IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 50},
|
||||
{IT_STRING|IT_CVAR, NULL, "Surround Sound", &surround, 60},
|
||||
|
||||
@@ -1545,14 +1545,33 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||
{IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 125},
|
||||
{IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 135},
|
||||
{IT_STRING|IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 155}
|
||||
#else
|
||||
{IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 60},
|
||||
{IT_STRING|IT_CVAR, NULL, "Surround Sound", &surround, 70},
|
||||
|
||||
{IT_STRING|IT_CVAR, NULL, "Chat Notifications", &cv_chatnotifications, 85},
|
||||
{IT_STRING|IT_CVAR, NULL, "Character voices", &cv_kartvoices, 95},
|
||||
{IT_STRING|IT_CVAR, NULL, "Powerup Warning", &cv_kartinvinsfx, 105},
|
||||
|
||||
{IT_KEYHANDLER|IT_STRING, NULL, "Sound Test", M_HandleSoundTest, 115},
|
||||
{IT_STRING|IT_CALL, NULL, "Music Test", M_MusicTest, 125},
|
||||
|
||||
{IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 135},
|
||||
{IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 145},
|
||||
{IT_STRING|IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 165}
|
||||
#endif
|
||||
};
|
||||
|
||||
static const char* OP_SoundTooltips[] =
|
||||
{
|
||||
"Turn Sound effects on or off.",
|
||||
"Volume of sound effects.",
|
||||
"Turn Sound effects on or off.",
|
||||
"Volume of music.",
|
||||
"Volume of Sound effects.",
|
||||
"Turn Music on or off.",
|
||||
"Volume of Music.",
|
||||
#ifndef NO_MIDI
|
||||
"Turn Midi Music on or off.",
|
||||
"Volume of Midi Music.",
|
||||
#endif
|
||||
"Reverse left and right channels of audio.",
|
||||
"Surround Sound.",
|
||||
"Chat notification sound.",
|
||||
@@ -1869,8 +1888,7 @@ static menuitem_t OP_AdvServerOptionsMenu[] =
|
||||
|
||||
#ifndef NONET
|
||||
static const char* OP_AdvServerOptionsTooltips[] =
|
||||
{
|
||||
|
||||
{
|
||||
"Server used for master server.",
|
||||
"Attempts to resynchronise player to server.",
|
||||
"Maximum allowed delay.",
|
||||
@@ -4052,7 +4070,7 @@ void M_StartControlPanel(void)
|
||||
|
||||
Dummymenuplayer_OnChange();
|
||||
|
||||
if ((server || IsPlayerAdmin(consoleplayer)))
|
||||
if (server || IsPlayerAdmin(consoleplayer))
|
||||
{
|
||||
MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL;
|
||||
MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL;
|
||||
@@ -4818,7 +4836,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_ControlsDef)
|
||||
{
|
||||
if (!(OP_ControlsTooltips[itemOn] == NULL))
|
||||
if (!(OP_ControlsTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ControlsTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4828,7 +4846,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_MouseOptionsDef)
|
||||
{
|
||||
if (!(OP_MouseTooltips[itemOn] == NULL))
|
||||
if (!(OP_MouseTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_MouseTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4838,7 +4856,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_VideoOptionsDef)
|
||||
{
|
||||
if (!(OP_VideoTooltips[itemOn] == NULL))
|
||||
if (!(OP_VideoTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_VideoTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4848,7 +4866,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_SoundOptionsDef)
|
||||
{
|
||||
if (!(OP_SoundTooltips[itemOn] == NULL))
|
||||
if (!(OP_SoundTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SoundTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4858,7 +4876,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_SoundAdvancedDef)
|
||||
{
|
||||
if (!(OP_SoundAdvancedTooltips[itemOn] == NULL))
|
||||
if (!(OP_SoundAdvancedTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SoundAdvancedTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4868,7 +4886,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_ExpOptionsDef)
|
||||
{
|
||||
if (!(OP_ExpTooltips[itemOn] == NULL))
|
||||
if (!(OP_ExpTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ExpTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4878,7 +4896,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_ChatOptionsDef)
|
||||
{
|
||||
if (!(OP_ChatOptionsTooltips[itemOn] == NULL))
|
||||
if (!(OP_ChatOptionsTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ChatOptionsTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4890,7 +4908,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_GameOptionsDef)
|
||||
{
|
||||
if (!(OP_GameTooltips[itemOn] == NULL))
|
||||
if (!(OP_GameTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_GameTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4901,7 +4919,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_ServerOptionsDef)
|
||||
{
|
||||
if (!(OP_ServerOptionsTooltips[itemOn] == NULL))
|
||||
if (!(OP_ServerOptionsTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ServerOptionsTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4912,7 +4930,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_AdvServerOptionsDef)
|
||||
{
|
||||
if (!(OP_AdvServerOptionsTooltips[itemOn] == NULL))
|
||||
if (!(OP_AdvServerOptionsTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_AdvServerOptionsTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4925,7 +4943,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_PlayerDistortDef)
|
||||
{
|
||||
if (!(OP_PlayerDistortTooltips[itemOn] == NULL))
|
||||
if (!(OP_PlayerDistortTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_PlayerDistortTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4938,7 +4956,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_SaturnCreditsDef) // C:
|
||||
{
|
||||
if (!(OP_CreditTooltips[itemOn] == NULL))
|
||||
if (!(OP_CreditTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_CreditTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4948,7 +4966,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_BirdDef)
|
||||
{
|
||||
if (!(OP_BirdTooltips[itemOn] == NULL))
|
||||
if (!(OP_BirdTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_BirdTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4958,7 +4976,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_TiltDef)
|
||||
{
|
||||
if (!(OP_TiltTooltips[itemOn] == NULL))
|
||||
if (!(OP_TiltTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_TiltTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -4968,7 +4986,7 @@ static void M_DrawGenericMenu(void)
|
||||
|
||||
if (currentMenu == &OP_AdvancedBirdDef)
|
||||
{
|
||||
if (!(OP_AdvancedBirdTooltips[itemOn] == NULL))
|
||||
if (!(OP_AdvancedBirdTooltips[itemOn] == NULL))
|
||||
{
|
||||
M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_AdvancedBirdTooltips[itemOn], 30, coolalphatimer);
|
||||
if (coolalphatimer > 0 && interpTimerHackAllow)
|
||||
@@ -7915,17 +7933,21 @@ static void M_DrawSkyRoom(void)
|
||||
(digital_disabled ? warningflags : highlightflags),
|
||||
(digital_disabled ? "OFF" : "ON"));
|
||||
|
||||
/*V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
|
||||
#ifndef NO_MIDI
|
||||
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x,
|
||||
currentMenu->y+currentMenu->menuitems[5].alphaKey,
|
||||
(midi_disabled ? warningflags : highlightflags),
|
||||
(midi_disabled ? "OFF" : "ON"));*/
|
||||
(midi_disabled ? "OFF" : "ON"));
|
||||
#endif
|
||||
|
||||
if (itemOn == 0)
|
||||
lengthstring = 8*(sound_disabled ? 3 : 2);
|
||||
else if (itemOn == 2)
|
||||
lengthstring = 8*(digital_disabled ? 3 : 2);
|
||||
/*else if (itemOn == 5)
|
||||
lengthstring = 8*(midi_disabled ? 3 : 2);*/
|
||||
#ifndef NO_MIDI
|
||||
else if (itemOn == 5)
|
||||
lengthstring = 8*(midi_disabled ? 3 : 2);
|
||||
#endif
|
||||
}
|
||||
|
||||
for (i = 0; i < currentMenu->numitems; ++i)
|
||||
@@ -9259,8 +9281,6 @@ void M_ModeAttackRetry(INT32 choice)
|
||||
G_CheckDemoStatus(); // Cancel recording
|
||||
if (modeattacking == ATTACKING_RECORD)
|
||||
M_ChooseTimeAttack(0);
|
||||
/*else if (modeattacking == ATTACKING_NIGHTS)
|
||||
M_ChooseNightsAttack(0);*/
|
||||
}
|
||||
|
||||
static void M_ModeAttackEndGame(INT32 choice)
|
||||
|
||||
Reference in new issue
Block a user