From 5fcb90cafd1197cc19d372fdf3626632d3118e6f Mon Sep 17 00:00:00 2001 From: Azaezel Date: Sun, 9 Jul 2017 15:05:56 -0500 Subject: [PATCH] kills off the last vestiges of xenon support --- Engine/source/app/net/serverQuery.cpp | 5 +++-- Engine/source/platform/platform.h | 4 ---- Engine/source/sfx/xaudio/sfxXAudioProvider.cpp | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Engine/source/app/net/serverQuery.cpp b/Engine/source/app/net/serverQuery.cpp index a74117cfd..4c91caf70 100644 --- a/Engine/source/app/net/serverQuery.cpp +++ b/Engine/source/app/net/serverQuery.cpp @@ -223,8 +223,7 @@ struct ServerFilter Dedicated = BIT(0), NotPassworded = BIT(1), Linux = BIT(2), - CurrentVersion = BIT(7), - NotXenon = BIT(6) + CurrentVersion = BIT(6) }; enum // Region mask flags @@ -1740,6 +1739,7 @@ static void handleGameMasterInfoRequest( const NetAddress* address, U32 key, U8 #if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_OPENBSD) temp8 |= ServerInfo::Status_Linux; #endif + if ( Con::getBoolVariable( "Server::Dedicated" ) ) temp8 |= ServerInfo::Status_Dedicated; if ( dStrlen( Con::getVariable( "pref::Server::Password" ) ) > 0 ) @@ -2001,6 +2001,7 @@ static void handleGameInfoRequest( const NetAddress* address, U32 key, U8 flags #if defined(TORQUE_OS_LINUX) || defined(TORQUE_OS_OPENBSD) status |= ServerInfo::Status_Linux; #endif + if ( Con::getBoolVariable( "Server::Dedicated" ) ) status |= ServerInfo::Status_Dedicated; if ( dStrlen( Con::getVariable( "pref::Server::Password" ) ) ) diff --git a/Engine/source/platform/platform.h b/Engine/source/platform/platform.h index 2fe7a16b5..b31356e67 100644 --- a/Engine/source/platform/platform.h +++ b/Engine/source/platform/platform.h @@ -99,10 +99,6 @@ enum ProcessorType CPU_PowerPC_G4_7455, CPU_PowerPC_G4_7447, CPU_PowerPC_G5, - - // Xenon - CPU_Xenon, - }; /// Properties for CPU. diff --git a/Engine/source/sfx/xaudio/sfxXAudioProvider.cpp b/Engine/source/sfx/xaudio/sfxXAudioProvider.cpp index 0390c9957..ab060ae5e 100644 --- a/Engine/source/sfx/xaudio/sfxXAudioProvider.cpp +++ b/Engine/source/sfx/xaudio/sfxXAudioProvider.cpp @@ -146,11 +146,9 @@ bool SFXXAudioProvider::_createXAudio( IXAudio2 **xaudio ) #define XAUDIO_FLAGS 0 #endif -#ifndef TORQUE_OS_XENON // This must be called first... it doesn't hurt to // call it more than once. CoInitialize( NULL ); -#endif // Try creating the xaudio engine. HRESULT hr = XAudio2Create( xaudio, XAUDIO_FLAGS, XAUDIO2_DEFAULT_PROCESSOR ); @@ -162,10 +160,7 @@ SFXDevice* SFXXAudioProvider::createDevice( const String& deviceName, bool useHa { String devName; - // On the 360, ignore what the prefs say, and create the only audio device -#ifndef TORQUE_OS_XENON devName = deviceName; -#endif XADeviceInfo* info = dynamic_cast< XADeviceInfo* >( _findDeviceInfo( devName ) );