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/platform/types.xenon.h b/Engine/source/platform/types.xenon.h deleted file mode 100644 index 5dc47547c..000000000 --- a/Engine/source/platform/types.xenon.h +++ /dev/null @@ -1,49 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -#ifndef _TYPESXENON_H_ -#define _TYPESXENON_H_ - -///< Calling convention -#ifdef FN_CDECL -# undef FN_CDECL -#endif -#define FN_CDECL __cdecl - -// size_t is needed to overload new -// size_t tends to be OS and compiler specific and may need to -// be if/def'ed in the future -typedef size_t dsize_t; - -struct FileTime -{ - U32 v1; - U32 v2; -}; - - -#ifndef NULL -# define NULL (0) -#endif - - -#endif //_TYPESXENON_H_ \ No newline at end of file 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 ) );