Browse Source

kills off the last vestiges of xenon support

Azaezel 8 years ago
parent
commit
5fcb90cafd

+ 3 - 2
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" ) ) )

+ 0 - 4
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.

+ 0 - 5
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 ) );