TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kills off the last vestiges of xenon support

Browse source
This commit is contained in:
Azaezel 2017-07-09 15:05:56 -05:00
parent 412c0380f4
commit 5fcb90cafd
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/app/net/serverQuery.cpp
View file

@ -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" ) ) )

4
Engine/source/platform/platform.h
View file

@ -99,10 +99,6 @@ enum ProcessorType
CPU_PowerPC_G4_7455,
CPU_PowerPC_G4_7447,
CPU_PowerPC_G5,
// Xenon
CPU_Xenon,
};
/// Properties for CPU.

5
Engine/source/sfx/xaudio/sfxXAudioProvider.cpp
View file

@ -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 ) );