ref: d8207118a577ff0547a8f36993c00811f96fe9f5
parent: 1233bc5783f51b67ab70eda520a223d278574d21
author: Tanguy Fautre <[email protected]>
date: Tue Feb 25 16:47:19 EST 2020
Removed obsolete eightytwofifty (8250 UART) option.
--- a/Game/src/duke3d.h
+++ b/Game/src/duke3d.h
@@ -628,7 +628,7 @@
extern int32_t numfreezebounces,rpgblastradius,pipebombblastradius,tripbombblastradius,shrinkerblastradius,morterblastradius,bouncemineblastradius,seenineblastradius;
// CTW - MODIFICATION
// extern uint8_t stereo,eightytwofifty,playerswhenstarted,playonten,everyothertime;
-extern uint8_t stereo,eightytwofifty,playerswhenstarted,everyothertime;
+extern uint8_t stereo,playerswhenstarted,everyothertime;
// CTW END - MODIFICATION
extern int32_t myminlag[MAXPLAYERS], mymaxlag, otherminlag, bufferjitter;
--- a/Game/src/game.c
+++ b/Game/src/game.c
@@ -77,7 +77,6 @@
#define TIMERUPDATESIZ 32
int32_t cameradist = 0, cameraclock = 0;
-uint8_t eightytwofifty = 0;
uint8_t playerswhenstarted;
uint8_t qe,cp;
@@ -7193,13 +7192,6 @@
continue;
}
- if(*c == '-')
- {- if( *(c+1) == '8' ) eightytwofifty = 1;
- i++;
- continue;
- }
-
if(*c == '?')
{comlinehelp(argv);
@@ -8240,19 +8232,6 @@
Startup();
-
- if( eightytwofifty && numplayers > 1 && (MusicDevice != SC_Unknown) )
- {- puts("\n=========================================================================");- puts("WARNING: 8250 UART detected.");- puts("Music is being disabled and lower quality sound is being set. We apologize");- puts("for this, but it is necessary to maintain high frame rates while trying to");- puts("play the game on an 8250. We suggest upgrading to a 16550 or better UART");- puts("for maximum performance. Press any key to continue.");- puts("=========================================================================\n");-
- while( !KB_KeyWaiting() ) getpackets();
- }
if(g_bStun)
{--- a/Game/src/menues.c
+++ b/Game/src/menues.c
@@ -2472,8 +2472,7 @@
case 1:
- if(eightytwofifty == 0 || numplayers < 2)
- if(MusicDevice != SC_Unknown)
+ if(MusicDevice != SC_Unknown)
{MusicToggle = 1-MusicToggle;
if( MusicToggle == 0 )
@@ -2516,12 +2515,15 @@
break;
}
- if(SoundToggle && FXDevice != SC_Unknown) menutext(c+160+40,43,0,(FXDevice == SC_Unknown),"ON");
- else menutext(c+160+40,43,0,(FXDevice == SC_Unknown),"OFF");
+ if(SoundToggle && FXDevice != SC_Unknown)
+ menutext(c+160+40,43,0,(FXDevice == SC_Unknown),"ON");
+ else
+ menutext(c+160+40,43,0,(FXDevice == SC_Unknown),"OFF");
- if(MusicToggle && (MusicDevice != SC_Unknown) && (!eightytwofifty||numplayers<2))
+ if(MusicToggle && MusicDevice != SC_Unknown)
menutext(c+160+40,43+16,0,(MusicDevice == SC_Unknown),"ON");
- else menutext(c+160+40,43+16,0,(MusicDevice == SC_Unknown),"OFF");
+ else
+ menutext(c+160+40,43+16,0,(MusicDevice == SC_Unknown),"OFF");
menutext(c,43,SHX(-2),(FXDevice == SC_Unknown),"SOUND");
menutext(c,43+16+16,SHX(-4),(FXDevice==SC_Unknown)||SoundToggle==0,"SOUND VOLUME");
@@ -2535,14 +2537,14 @@
FX_SetVolume( (short) FXVolume );
}
menutext(c,43+16,SHX(-3),(MusicDevice==SC_Unknown),"MUSIC");
- menutext(c,43+16+16+16,SHX(-5),(MusicDevice==SC_Unknown)||(numplayers > 1 && eightytwofifty)||MusicToggle==0,"MUSIC VOLUME");
+ menutext(c,43+16+16+16,SHX(-5),(MusicDevice==SC_Unknown)||MusicToggle==0,"MUSIC VOLUME");
{l = MusicVolume;
MusicVolume >>= 2;
bar(c+167+40,43+16+16+16,
(short *)&MusicVolume,4,
- (eightytwofifty==0||numplayers < 2) && (MusicDevice!=SC_Unknown) && x==3,SHX(-5),
- (numplayers > 1 && eightytwofifty)||MusicToggle==0||(MusicDevice==SC_Unknown));
+ (MusicDevice!=SC_Unknown) && x==3,SHX(-5),
+ (MusicToggle==0)||(MusicDevice==SC_Unknown));
MusicVolume <<= 2;
if(l != MusicVolume)
{--- a/Game/src/sounds.c
+++ b/Game/src/sounds.c
@@ -58,30 +58,21 @@
// if they chose None lets return
if (FXDevice == SC_Unknown) return;
- if (eightytwofifty && numplayers > 1)
+ status = FX_Init(FXDevice, NumVoices, NumChannels, NumBits, MixRate);
+
+ if (status != FX_Ok)
{- status = FX_Init(FXDevice, min(NumVoices, 4), 1, 8, 8000);
+ Error(EXIT_FAILURE, FX_ErrorString(FX_Error));
}
- else
- {- status = FX_Init(FXDevice, NumVoices, NumChannels, NumBits, MixRate);
- }
- if (status == FX_Ok)
- {- FX_SetVolume(FXVolume);
- if (ReverseStereo == 1)
- {- FX_SetReverseStereo(!FX_GetReverseStereo());
- }
- }
- if (status != FX_Ok)
+ FX_SetVolume(FXVolume);
+ if (ReverseStereo == 1)
{- Error(EXIT_FAILURE, FX_ErrorString(FX_Error));
+ FX_SetReverseStereo(!FX_GetReverseStereo());
}
status = FX_SetCallBack(TestCallBack);
-
+
if (status != FX_Ok)
{Error(EXIT_FAILURE, FX_ErrorString(FX_Error));
@@ -119,32 +110,32 @@
===================
*/
-void MusicStartup( void )
- {- int32 status;
+void MusicStartup(void)
+{+ int32 status;
- // if they chose None lets return
- if ((MusicDevice == SC_Unknown) || (eightytwofifty && numplayers > 1) )
- return;
+ // if they chose None lets return
+ if (MusicDevice == SC_Unknown)
+ return;
- status = MUSIC_Init( MusicDevice, MidiPort );
+ status = MUSIC_Init(MusicDevice, MidiPort);
- if ( status == MUSIC_Ok )
- {- MUSIC_SetVolume( MusicVolume );
- }
- else
- {- SoundShutdown();
- uninittimer();
- uninitengine();
- CONTROL_Shutdown();
- CONFIG_WriteSetup();
- KB_Shutdown();
- uninitgroupfile();
- unlink("duke3d.tmp");- Error(EXIT_FAILURE, "Couldn't find selected sound card, or, error w/ sound card itself\n");
- }
+ if (status == MUSIC_Ok)
+ {+ MUSIC_SetVolume(MusicVolume);
+ }
+ else
+ {+ SoundShutdown();
+ uninittimer();
+ uninitengine();
+ CONTROL_Shutdown();
+ CONFIG_WriteSetup();
+ KB_Shutdown();
+ uninitgroupfile();
+ unlink("duke3d.tmp");+ Error(EXIT_FAILURE, "Couldn't find selected sound card, or, error w/ sound card itself\n");
+ }
}
/*
@@ -155,20 +146,20 @@
===================
*/
-void MusicShutdown( void )
- {- int32 status;
+void MusicShutdown(void)
+{+ int32 status;
- // if they chose None lets return
- if ((MusicDevice == SC_Unknown) || (eightytwofifty && numplayers > 1) )
- return;
+ // if they chose None lets return
+ if (MusicDevice == SC_Unknown)
+ return;
- status = MUSIC_Shutdown();
- if ( status != MUSIC_Ok )
- {- //Error( MUSIC_ErrorString( MUSIC_ErrorCode ));
- }
- }
+ status = MUSIC_Shutdown();
+ if (status != MUSIC_Ok)
+ {+ //Error( MUSIC_ErrorString( MUSIC_ErrorCode ));
+ }
+}
int USRHOOKS_GetMem(void **ptr, uint32_t size )