macos,ios: engine: use openal instead of old macos api

.github/workflows/build.yml

@@ -2,7 +2,6 @@ name: Build
 
 on: [push, pull_request]
 
-
 jobs:
   build-linux-i386:
     runs-on: ubuntu-latest
@@ -39,7 +38,7 @@ jobs:
     - name: Build windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug --32bits
+        ./waf.bat configure -T debug
         ./waf.bat build
 
   build-windows-amd64:
@@ -50,7 +49,7 @@ jobs:
     - name: Build windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug
+        ./waf.bat configure -T debug -8
         ./waf.bat build
 
   build-dedicated-windows-i386:
@@ -72,7 +71,7 @@ jobs:
     - name: Build dedicated windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T debug -d
+        ./waf.bat configure -T debug -d -8
         ./waf.bat build
 
   build-dedicated-linux-i386:

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Run tests windows-i386
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/ --32bits
+        ./waf.bat configure -T release --tests --prefix=out/
         ./waf.bat install
         cd out
         $env:Path = "bin";
@@ -52,7 +52,7 @@ jobs:
     - name: Run tests windows-amd64
       run: |
         git submodule init && git submodule update
-        ./waf.bat configure -T release --tests --prefix=out/
+        ./waf.bat configure -T release --tests --prefix=out/ -8
         ./waf.bat install
         cd out
         $env:Path = "bin";

appframework/sdlmgr.cpp

@@ -404,9 +404,6 @@ private:
 	int m_MouseButtonDownX;
 	int m_MouseButtonDownY;
 
-	bool m_bResetVsync;
-	int m_nFramesToSkip;
-
 	double m_flPrevGLSwapWindowTime;
 };
 
@@ -587,9 +584,6 @@ InitReturnVal_t CSDLMgr::Init()
 	m_nWarpDelta = 0;
 	m_bRawInput = false;
 
-	m_nFramesToSkip = 0;
-	m_bResetVsync = false;
-
 	m_flPrevGLSwapWindowTime = 0.0f;
 
 	memset(m_pixelFormatAttribs, '\0', sizeof (m_pixelFormatAttribs));
@@ -1437,20 +1431,7 @@ void CSDLMgr::ShowPixels( CShowPixelsParams *params )
 
 	m_flPrevGLSwapWindowTime = tm.GetDurationInProgress().GetMillisecondsF();
 
-#ifdef ANDROID
+	
-	// ADRENO GPU MOMENT, SKIP 5 FRAMES
-	if( m_bResetVsync )
-	{
-		if( m_nFramesToSkip <= 0 )
-		{
-			SDL_GL_SetSwapInterval(swapInterval);
-			m_bResetVsync = false;
-		}
-		else
-			m_nFramesToSkip--;
-	}
-#endif
-
 	CheckGLError( __LINE__ );
 }
 #endif // DX_TO_GL_ABSTRACTION
@@ -1906,7 +1887,6 @@ void CSDLMgr::PumpWindowsMessageLoop()
 					}
 					case SDL_WINDOWEVENT_FOCUS_GAINED:
 					{
-						m_bResetVsync = true; m_nFramesToSkip = 3;
 						m_bHasFocus = true;
 						SDL_ShowCursor( m_bCursorVisible ? 1 : 0 );
 						CCocoaEvent theEvent;

common/imageutils.cpp

@@ -65,12 +65,9 @@ extern void longjmp( jmp_buf, int ) __attribute__((noreturn));
 #define JPEGLIB_USE_STDIO
 #if ANDROID
 #include "android/jpeglib/jpeglib.h"
-#elif defined WIN32
-#include "jpeglib/jpeglib.h"
 #else
-#include <jpeglib.h>
+#include "jpeglib/jpeglib.h"
 #endif
-
 #undef JPEGLIB_USE_STDIO
 
 

dedicated/sys_ded.cpp

@@ -278,7 +278,7 @@ bool CDedicatedAppSystemGroup::PreInit( )
 		return false;
 
 #ifdef _WIN32
-	g_bVGui = CommandLine()->CheckParm( "-vgui" );
+	g_bVGui = !CommandLine()->CheckParm( "-console" );
 #endif
 
 	CreateInterfaceFn factory = GetFactory();

dedicated/wscript

@@ -38,12 +38,7 @@ def build(bld):
 
 	if bld.env.DEST_OS == 'win32':
 		source += [
-			'sys_windows.cpp',
+			'sys_windows.cpp'
-			'vgui/CreateMultiplayerGameServerPage.cpp',
-			'vgui/MainPanel.cpp',
-			'../public/vgui_controls/vgui_controls.cpp',
-			'vgui/vguihelpers.cpp',
-			'console/TextConsoleWin32.cpp'
 		]
 	else:
 		source += [
@@ -64,9 +59,6 @@ def build(bld):
 
 	libs = ['tier0','vpklib','tier1','tier2','tier3','vstdlib','steam_api','appframework','mathlib', 'EDIT']
 
-	if bld.env.DEST_OS == 'win32':
-		libs += ['vgui_controls', 'USER32', 'SHELL32']
-
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(

dedicated_main/dedicated_main.rc

@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "windows.h"
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS

engine/NetworkStringTableItem.cpp

@@ -199,7 +199,7 @@ bool CNetworkStringTableItem::SetUserData( int tick, int length, const void *use
 
 	if ( length > 0 )
 	{
-		m_pUserData = new unsigned char[ALIGN_VALUE( length, 4 )];
+		m_pUserData = new unsigned char[ length ];
 		Q_memcpy( m_pUserData, userData, length );
 	}
 	else

engine/audio/snd_dev_mac_audioqueue.cpp

@@ -1,599 +0,0 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-//===========================================================================//
-
-#include "audio_pch.h"
-#include <AudioToolbox/AudioQueue.h>
-#include <AudioToolbox/AudioFile.h>
-#include <AudioToolbox/AudioFormat.h>
-
-// memdbgon must be the last include file in a .cpp file!!!
-#include "tier0/memdbgon.h"
-
-extern bool snd_firsttime;
-extern bool MIX_ScaleChannelVolume( paintbuffer_t *ppaint, channel_t *pChannel, int volume[CCHANVOLUMES], int mixchans );
-extern void S_SpatializeChannel( int volume[6], int master_vol, const Vector *psourceDir, float gain, float mono );
-
-#define NUM_BUFFERS_SOURCES		128
-#define	BUFF_MASK				(NUM_BUFFERS_SOURCES - 1 )
-#define	BUFFER_SIZE			0x0400
-
-
-//-----------------------------------------------------------------------------
-//
-// NOTE: This only allows 16-bit, stereo wave out
-//
-//-----------------------------------------------------------------------------
-class CAudioDeviceAudioQueue : public CAudioDeviceBase
-{
-public:
-	bool		IsActive( void );
-	bool		Init( void );
-	void		Shutdown( void );
-	void		PaintEnd( void );
-	int			GetOutputPosition( void );
-	void		ChannelReset( int entnum, int channelIndex, float distanceMod );
-	void		Pause( void );
-	void		UnPause( void );
-	float		MixDryVolume( void );
-	bool		Should3DMix( void );
-	void		StopAllSounds( void );
-
-	int			PaintBegin( float mixAheadTime, int soundtime, int paintedtime );
-	void		ClearBuffer( void );
-	void		UpdateListener( const Vector& position, const Vector& forward, const Vector& right, const Vector& up );
-	void		MixBegin( int sampleCount );
-	void		MixUpsample( int sampleCount, int filtertype );
-	void		Mix8Mono( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix8Stereo( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix16Mono( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-	void		Mix16Stereo( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress );
-
-	void		TransferSamples( int end );
-	void		SpatializeChannel( int volume[CCHANVOLUMES/2], int master_vol, const Vector& sourceDir, float gain, float mono);
-	void		ApplyDSPEffects( int idsp, portable_samplepair_t *pbuffront, portable_samplepair_t *pbufrear, portable_samplepair_t *pbufcenter, int samplecount );
-
-	const char *DeviceName( void )			{ return "AudioQueue"; }
-	int			DeviceChannels( void )		{ return 2; }
-	int			DeviceSampleBits( void )	{ return 16; }
-	int			DeviceSampleBytes( void )	{ return 2; }
-	int			DeviceDmaSpeed( void )		{ return SOUND_DMA_SPEED; }
-	int			DeviceSampleCount( void )	{ return m_deviceSampleCount; }
-
-	void BufferCompleted() { m_buffersCompleted++; }
-	void SetRunning( bool bState ) { m_bRunning = bState; }
-	
-private:
-	void	OpenWaveOut( void );
-	void	CloseWaveOut( void );
-	bool	ValidWaveOut( void ) const;
-	bool	BIsPlaying();
-
-	AudioStreamBasicDescription m_DataFormat;
-	AudioQueueRef               m_Queue;
-	AudioQueueBufferRef         m_Buffers[NUM_BUFFERS_SOURCES];
-	
-	int		m_SndBufSize;
-	
-	void *m_sndBuffers;
-	
-	CInterlockedInt	m_deviceSampleCount;
-
-	int			m_buffersSent;
-	int			m_buffersCompleted;
-	int			m_pauseCount;
-	bool		m_bSoundsShutdown;
-	
-	bool m_bFailed;
-	bool m_bRunning;
-	
-	
-};
-
-CAudioDeviceAudioQueue *wave = NULL;
-
-
-static void AudioCallback(void *pContext, AudioQueueRef pQueue, AudioQueueBufferRef pBuffer)
-{
-	if ( wave )
-		wave->BufferCompleted();
-}
-
-
-IAudioDevice *Audio_CreateMacAudioQueueDevice( void )
-{
-	wave = new CAudioDeviceAudioQueue;
-	if ( wave->Init() )
-		return wave;
-	
-	delete wave;
-	wave = NULL;
-	
-	return NULL;
-}
-
-
-void OnSndSurroundCvarChanged2( IConVar *pVar, const char *pOldString, float flOldValue );
-void OnSndSurroundLegacyChanged2( IConVar *pVar, const char *pOldString, float flOldValue );
-
-//-----------------------------------------------------------------------------
-// Init, shutdown
-//-----------------------------------------------------------------------------
-bool CAudioDeviceAudioQueue::Init( void )
-{
-	m_SndBufSize = 0;
-	m_sndBuffers = NULL;
-	m_pauseCount = 0;
-
-	m_bSurround = false;
-	m_bSurroundCenter = false;
-	m_bHeadphone = false;
-	m_buffersSent = 0;
-	m_buffersCompleted = 0;
-	m_pauseCount = 0;
-	m_bSoundsShutdown = false;
-	m_bFailed = false;
-	m_bRunning = false;
-	
-	m_Queue = NULL;
-	
-	static bool first = true;
-	if ( first )
-	{
-		snd_surround.SetValue( 2 );
-		snd_surround.InstallChangeCallback( &OnSndSurroundCvarChanged2 );
-		snd_legacy_surround.InstallChangeCallback( &OnSndSurroundLegacyChanged2 );
-		first = false;
-	}
-	
-	OpenWaveOut();
-
-	if ( snd_firsttime )
-	{
-		DevMsg( "Wave sound initialized\n" );
-	}
-	return ValidWaveOut() && !m_bFailed;
-}
-
-void CAudioDeviceAudioQueue::Shutdown( void )
-{
-	CloseWaveOut();
-}
-
-
-//-----------------------------------------------------------------------------
-// WAV out device
-//-----------------------------------------------------------------------------
-inline bool CAudioDeviceAudioQueue::ValidWaveOut( void ) const 
-{ 
-	return m_sndBuffers != 0 && m_Queue; 
-}
-
-
-//-----------------------------------------------------------------------------
-// called by the mac audioqueue code when we run out of playback buffers
-//-----------------------------------------------------------------------------
-void AudioQueueIsRunningCallback( void* inClientData, AudioQueueRef inAQ, AudioQueuePropertyID inID)
-{
-    CAudioDeviceAudioQueue* audioqueue = (CAudioDeviceAudioQueue*)inClientData;
-	
-	UInt32 running = 0;
-	UInt32 size;
-	OSStatus err = AudioQueueGetProperty(inAQ, kAudioQueueProperty_IsRunning, &running, &size);
-	audioqueue->SetRunning( running != 0 );
-	//DevWarning( "AudioQueueStart %d\n", running );
-}
-
-
-
-
-//-----------------------------------------------------------------------------
-// Opens the windows wave out device
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::OpenWaveOut( void )
-{
-	if ( m_Queue ) 
-		return;
-		
-	m_buffersSent = 0;
-	m_buffersCompleted = 0;
-		
-    m_DataFormat.mSampleRate       = 44100;
-    m_DataFormat.mFormatID         = kAudioFormatLinearPCM;
-    m_DataFormat.mFormatFlags      = kAudioFormatFlagIsSignedInteger|kAudioFormatFlagIsPacked;
-    m_DataFormat.mBytesPerPacket   = 4; // 16-bit samples * 2 channels
-    m_DataFormat.mFramesPerPacket  = 1;
-    m_DataFormat.mBytesPerFrame    = 4; // 16-bit samples * 2 channels
-    m_DataFormat.mChannelsPerFrame = 2;
-    m_DataFormat.mBitsPerChannel   = 16;
-    m_DataFormat.mReserved         = 0;
-	
-    // Create the audio queue that will be used to manage the array of audio
-    // buffers used to queue samples.
-    OSStatus err = AudioQueueNewOutput(&m_DataFormat, AudioCallback, this, NULL, NULL, 0, &m_Queue);	
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-		
-    for ( int i = 0; i < NUM_BUFFERS_SOURCES; ++i) 
-	{
-        err = AudioQueueAllocateBuffer( m_Queue, BUFFER_SIZE,&(m_Buffers[i]));
-		if ( err != noErr) 
-		{
-			DevMsg( "Failed to AudioQueueAllocateBuffer output %d (%i)\n",(int)err,i );
-			m_bFailed = true;
-		}
-		
-        m_Buffers[i]->mAudioDataByteSize = BUFFER_SIZE;        
-        Q_memset( m_Buffers[i]->mAudioData, 0, BUFFER_SIZE );
-    }
-	
-    err = AudioQueuePrime( m_Queue, 0, NULL);
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-	
-	AudioQueueSetParameter( m_Queue, kAudioQueueParam_Volume, 1.0);
-	
-	err = AudioQueueAddPropertyListener( m_Queue, kAudioQueueProperty_IsRunning, AudioQueueIsRunningCallback, this );
-	if ( err != noErr) 
-	{
-		DevMsg( "Failed to create AudioQueue output %d\n", (int)err );
-		m_bFailed = true;
-		return;
-	}
-	
-	m_SndBufSize = NUM_BUFFERS_SOURCES*BUFFER_SIZE;
-	m_deviceSampleCount = m_SndBufSize / DeviceSampleBytes();
-	
-	if ( !m_sndBuffers )
-	{
-		m_sndBuffers = malloc( m_SndBufSize );
-		memset( m_sndBuffers, 0x0, m_SndBufSize );
-	}
-}
-
-
-//-----------------------------------------------------------------------------
-// Closes the windows wave out device
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::CloseWaveOut( void ) 
-{ 
-	if ( ValidWaveOut() )
-	{
-		AudioQueueStop(m_Queue, true);
-		m_bRunning = false;
-		
-		AudioQueueRemovePropertyListener( m_Queue, kAudioQueueProperty_IsRunning, AudioQueueIsRunningCallback, this );
-		
-		for ( int i = 0; i < NUM_BUFFERS_SOURCES; i++ )
-			AudioQueueFreeBuffer( m_Queue, m_Buffers[i]);
-
-		AudioQueueDispose( m_Queue, true);
-		
-		m_Queue = NULL;
-	}
-	
-	if ( m_sndBuffers )
-	{
-		free( m_sndBuffers );
-		m_sndBuffers = NULL;
-	}
-}
-
-
-
-//-----------------------------------------------------------------------------
-// Mixing setup
-//-----------------------------------------------------------------------------
-int CAudioDeviceAudioQueue::PaintBegin( float mixAheadTime, int soundtime, int paintedtime )
-{
-	//  soundtime - total samples that have been played out to hardware at dmaspeed
-	//  paintedtime - total samples that have been mixed at speed
-	//  endtime - target for samples in mixahead buffer at speed
-
-	unsigned int endtime = soundtime + mixAheadTime * DeviceDmaSpeed();
-	
-	int samps = DeviceSampleCount() >> (DeviceChannels()-1);
-
-	if ((int)(endtime - soundtime) > samps)
-		endtime = soundtime + samps;
-
-	if ((endtime - paintedtime) & 0x3)
-	{
-		// The difference between endtime and painted time should align on 
-		// boundaries of 4 samples.  This is important when upsampling from 11khz -> 44khz.
-		endtime -= (endtime - paintedtime) & 0x3;
-	}
-
-	return endtime;
-}
-
-
-//-----------------------------------------------------------------------------
-// Actually performs the mixing
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::PaintEnd( void )
-{
-	int	cblocks = 4 << 1; 
-
-	if ( m_bRunning && m_buffersSent == m_buffersCompleted )
-	{
-		// We are running the audio queue but have become starved of buffers.
-		// Stop the audio queue so we force a restart of it.
-		AudioQueueStop( m_Queue, true );
-	}
-
-	//
-	// submit a few new sound blocks
-	//
-	// 44K sound support
-	while (((m_buffersSent - m_buffersCompleted) >> SAMPLE_16BIT_SHIFT) < cblocks)
-	{	
-		int iBuf = m_buffersSent&BUFF_MASK; 
-		
-		m_Buffers[iBuf]->mAudioDataByteSize = BUFFER_SIZE;
-		Q_memcpy( m_Buffers[iBuf]->mAudioData, (char *)m_sndBuffers + iBuf*BUFFER_SIZE, BUFFER_SIZE);
-		
-		// Queue the buffer for playback.
-		OSStatus err = AudioQueueEnqueueBuffer( m_Queue, m_Buffers[iBuf], 0, NULL);
-		if ( err != noErr) 
-		{
-			DevMsg( "Failed to AudioQueueEnqueueBuffer output %d\n", (int)err );
-		}
-		
-		m_buffersSent++;
-	}
-
-	
-	if ( !m_bRunning )
-	{
-		DevMsg( "Restarting sound playback\n" );
-		m_bRunning = true;
-		AudioQueueStart( m_Queue, NULL);
-	}
-
-}
-
-int CAudioDeviceAudioQueue::GetOutputPosition( void )
-{
-	int s = m_buffersSent * BUFFER_SIZE;
-
-	s >>= SAMPLE_16BIT_SHIFT;
-
-	s &= (DeviceSampleCount()-1);
-
-	return s / DeviceChannels();
-}
-
-
-//-----------------------------------------------------------------------------
-// Pausing
-//-----------------------------------------------------------------------------
-void CAudioDeviceAudioQueue::Pause( void )
-{
-	m_pauseCount++;
-	if (m_pauseCount == 1)
-	{
-		m_bRunning = false;
-		AudioQueueStop(m_Queue, true);
-	}
-}
-
-
-void CAudioDeviceAudioQueue::UnPause( void )
-{
-	if ( m_pauseCount > 0 )
-	{
-		m_pauseCount--;
-	}
-	
-	if ( m_pauseCount == 0 )
-	{ 
-		m_bRunning = true;
-		AudioQueueStart( m_Queue, NULL);
-	}
-}
-
-bool CAudioDeviceAudioQueue::IsActive( void )
-{
-	return ( m_pauseCount == 0 );
-}
-
-float CAudioDeviceAudioQueue::MixDryVolume( void )
-{
-	return 0;
-}
-
-
-bool CAudioDeviceAudioQueue::Should3DMix( void )
-{
-	return false;
-}
-
-
-void CAudioDeviceAudioQueue::ClearBuffer( void )
-{
-	if ( !m_sndBuffers )
-		return;
-
-	Q_memset( m_sndBuffers, 0x0, DeviceSampleCount() * DeviceSampleBytes() );
-}
-
-void CAudioDeviceAudioQueue::UpdateListener( const Vector& position, const Vector& forward, const Vector& right, const Vector& up )
-{
-}
-
-
-bool CAudioDeviceAudioQueue::BIsPlaying()
-{
-	UInt32 isRunning;  
-	UInt32 propSize = sizeof(isRunning);  
-  
-    OSStatus result = AudioQueueGetProperty( m_Queue, kAudioQueueProperty_IsRunning, &isRunning, &propSize);  
-	return isRunning != 0;
-}
-
-
-void CAudioDeviceAudioQueue::MixBegin( int sampleCount )
-{
-	MIX_ClearAllPaintBuffers( sampleCount, false );
-}
-
-
-void CAudioDeviceAudioQueue::MixUpsample( int sampleCount, int filtertype )
-{
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-	int ifilter = ppaint->ifilter;
-	
-	Assert (ifilter < CPAINTFILTERS);
-
-	S_MixBufferUpsample2x( sampleCount, ppaint->pbuf, &(ppaint->fltmem[ifilter][0]), CPAINTFILTERMEM, filtertype );
-
-	ppaint->ifilter++;
-}
-
-void CAudioDeviceAudioQueue::Mix8Mono( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 1))
-		return;
-
-	Mix8MonoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, (byte *)pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix8Stereo( channel_t *pChannel, char *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 2 ))
-		return;
-
-	Mix8StereoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, (byte *)pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix16Mono( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 1 ))
-		return;
-
-	Mix16MonoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::Mix16Stereo( channel_t *pChannel, short *pData, int outputOffset, int inputOffset, fixedint rateScaleFix, int outCount, int timecompress )
-{
-	int volume[CCHANVOLUMES];
-	paintbuffer_t *ppaint = MIX_GetCurrentPaintbufferPtr();
-
-	if (!MIX_ScaleChannelVolume( ppaint, pChannel, volume, 2 ))
-		return;
-
-	Mix16StereoWavtype( pChannel, ppaint->pbuf + outputOffset, volume, pData, inputOffset, rateScaleFix, outCount );
-}
-
-
-void CAudioDeviceAudioQueue::ChannelReset( int entnum, int channelIndex, float distanceMod )
-{
-}
-
-
-void CAudioDeviceAudioQueue::TransferSamples( int end )
-{
-	int		lpaintedtime = g_paintedtime;
-	int		endtime = end;
-	
-	// resumes playback...
-
-	if ( m_sndBuffers )
-	{
-		S_TransferStereo16( m_sndBuffers, PAINTBUFFER, lpaintedtime, endtime );
-	}
-}
-
-void CAudioDeviceAudioQueue::SpatializeChannel( int volume[CCHANVOLUMES/2], int master_vol, const Vector& sourceDir, float gain, float mono )
-{
-	VPROF("CAudioDeviceAudioQueue::SpatializeChannel");
-	S_SpatializeChannel( volume, master_vol, &sourceDir, gain, mono );
-}
-
-void CAudioDeviceAudioQueue::StopAllSounds( void )
-{
-	m_bSoundsShutdown = true;
-	m_bRunning = false;
-	AudioQueueStop(m_Queue, true);
-}
-
-
-
-void CAudioDeviceAudioQueue::ApplyDSPEffects( int idsp, portable_samplepair_t *pbuffront, portable_samplepair_t *pbufrear, portable_samplepair_t *pbufcenter, int samplecount )
-{
-	//SX_RoomFX( endtime, filter, timefx );
-	DSP_Process( idsp, pbuffront, pbufrear, pbufcenter, samplecount );
-}
-
-
-static uint32 GetOSXSpeakerConfig()
-{
-	return 2;
-}
-
-static uint32 GetSpeakerConfigForSurroundMode( int surroundMode, const char **pConfigDesc )
-{
-	uint32 newSpeakerConfig = 2;
-	*pConfigDesc = "stereo speaker";
-	return newSpeakerConfig;
-}
-
-
-
-void OnSndSurroundCvarChanged2( IConVar *pVar, const char *pOldString, float flOldValue )
-{
-	// if the old value is -1, we're setting this from the detect routine for the first time
-	// no need to reset the device
-	if ( flOldValue == -1 )
-		return;
-	
-	// get the user's previous speaker config
-	uint32 speaker_config = GetOSXSpeakerConfig();
-	
-	// get the new config
-	uint32 newSpeakerConfig = 0;
-	const char *speakerConfigDesc = "";
-	
-	ConVarRef var( pVar );
-	newSpeakerConfig = GetSpeakerConfigForSurroundMode( var.GetInt(), &speakerConfigDesc );
-	// make sure the config has changed
-	if (newSpeakerConfig == speaker_config)
-		return;
-	
-	// set new configuration
-	//SetWindowsSpeakerConfig(newSpeakerConfig);
-	
-	Msg("Speaker configuration has been changed to %s.\n", speakerConfigDesc);
-	
-	// restart sound system so it takes effect
-	//g_pSoundServices->RestartSoundSystem();
-}
-
-void OnSndSurroundLegacyChanged2( IConVar *pVar, const char *pOldString, float flOldValue )
-{
-}
-
-

engine/audio/snd_win.cpp

@@ -11,10 +11,6 @@
 #endif
 #ifdef OSX
 #include "snd_dev_openal.h"
-#include "snd_dev_mac_audioqueue.h"
-
-ConVar snd_audioqueue( "snd_audioqueue", "1" );
-
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
@@ -94,11 +90,6 @@ IAudioDevice *IAudioDevice::AutoDetectInit( bool waveOnly )
 			pDevice = Audio_CreateWaveDevice();
 		}
 #elif defined(OSX)
-		if ( !CommandLine()->CheckParm( "-snd_openal" ) )
-		{
-			DevMsg( "Using AudioQueue Interface\n" );
-			pDevice = Audio_CreateMacAudioQueueDevice();
-		}
 		if ( !pDevice )
 		{
 			DevMsg( "Using OpenAL Interface\n" );

engine/audio/voice.cpp

@@ -189,8 +189,6 @@ bool				g_bUsingSteamVoice = false;
 
 #ifdef WIN32
 extern IVoiceRecord* CreateVoiceRecord_DSound(int nSamplesPerSec);
-#elif defined( OSX )
-extern IVoiceRecord* CreateVoiceRecord_AudioQueue(int sampleRate);
 #endif
 
 #ifdef POSIX
@@ -643,13 +641,8 @@ bool Voice_Init( const char *pCodecName, int nSampleRate )
 		return false;
 
 	// Get the voice input device.
-#ifdef OSX
+#if defined( OSX )
-	g_pVoiceRecord = CreateVoiceRecord_AudioQueue( Voice_SamplesPerSec() );
+	g_pVoiceRecord = CreateVoiceRecord_OpenAL( Voice_SamplesPerSec() );
-	if ( !g_pVoiceRecord )
-	{
-		// Fall back to OpenAL
-		g_pVoiceRecord = CreateVoiceRecord_OpenAL( Voice_SamplesPerSec() );
-	}
 #elif defined( WIN32 )
 	g_pVoiceRecord = CreateVoiceRecord_DSound( Voice_SamplesPerSec() );
 #elif defined( USE_SDL )

engine/audio/voice_record_mac_audioqueue.cpp

@@ -1,528 +0,0 @@
-//========= Copyright 1996-2009, Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $NoKeywords: $
-//
-//=============================================================================//
-// This module implements the voice record and compression functions 
-
-#include <Carbon/Carbon.h>
-#include <AudioUnit/AudioUnit.h>
-#include <AudioToolbox/AudioToolbox.h>
-
-#include "tier0/platform.h"
-#include "tier0/threadtools.h"
-//#include "tier0/vcrmode.h"
-#include "ivoicerecord.h"
-
-
-#define kNumSecAudioBuffer	1.0f
-
-// ------------------------------------------------------------------------------
-// VoiceRecord_AudioQueue
-// ------------------------------------------------------------------------------
-
-class VoiceRecord_AudioQueue : public IVoiceRecord
-{
-public:
-	
-	VoiceRecord_AudioQueue();
-	virtual	~VoiceRecord_AudioQueue();
-
-	// IVoiceRecord.
-	virtual void		Release();
-	
-	virtual bool		RecordStart();
-	virtual void		RecordStop();
-	
-	// Initialize. The format of the data we expect from the provider is
-	// 8-bit signed mono at the specified sample rate.
-	virtual bool		Init( int nSampleRate );
-
-	virtual void		Idle();
-	
-	// Get the most recent N samples.
-	virtual int			GetRecordedData(short *pOut, int nSamplesWanted );
-	
-	AudioUnit GetAudioUnit() { return m_AudioUnit; }
-	AudioConverterRef GetConverter() { return m_Converter; }
-	void RenderBuffer( const short *pszBuf, int nSamples );
-	bool BRecording() { return m_bRecordingAudio; }
-	void ClearThreadHandle() { m_hThread = NULL; m_bFirstInit = false; }
-	
-	AudioBufferList m_MicInputBuffer;
-	AudioBufferList m_ConverterBuffer;
-	void *m_pMicInputBuffer;
-	
-	int m_nMicInputSamplesAvaialble;
-	float m_flSampleRateConversion;
-	int m_nBufferFrameSize;
-	int m_ConverterBufferSize;
-	int m_MicInputBufferSize;
-	int m_InputBytesPerPacket;
-
-private:
-	bool				InitalizeInterfaces();	// Initialize the openal capture buffers and other interfaces
-	void				ReleaseInterfaces();	// Release openal buffers and other interfaces
-	void				ClearInterfaces();				// Clear members.
-	
-	
-private:
-	AudioUnit m_AudioUnit;
-	char *m_SampleBuffer;
-	int m_SampleBufferSize;
-	int m_nSampleRate;
-	bool m_bRecordingAudio;
-	bool m_bFirstInit;
-	ThreadHandle_t m_hThread;
-	AudioConverterRef m_Converter;
-	
-	CInterlockedUInt m_SampleBufferReadPos;
-	CInterlockedUInt m_SampleBufferWritePos;
-	
-	//UInt32 nPackets = 0;
-	//bool bHaveListData = false;
-
-	
-};
-
-
-VoiceRecord_AudioQueue::VoiceRecord_AudioQueue() :
-m_nSampleRate( 0 ), m_AudioUnit( NULL ), m_SampleBufferSize(0), m_SampleBuffer(NULL),
-m_SampleBufferReadPos(0), m_SampleBufferWritePos(0), m_bRecordingAudio(false), m_hThread( NULL ), m_bFirstInit( true )
-{
-	ClearInterfaces();
-}
-
-
-VoiceRecord_AudioQueue::~VoiceRecord_AudioQueue()
-{
-	ReleaseInterfaces();
-	if ( m_hThread )
-		ReleaseThreadHandle( m_hThread );
-	m_hThread = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::Release()
-{
-	ReleaseInterfaces();
-}
-
-uintp StartAudio( void *pRecorder )
-{
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)pRecorder;
-	if ( vr )
-	{
-		//printf( "AudioOutputUnitStart\n" );
-		AudioOutputUnitStart( vr->GetAudioUnit() );
-		vr->ClearThreadHandle();
-	}
-	//printf( "StartAudio thread done\n" );
-
-	return 0;
-}
-
-bool VoiceRecord_AudioQueue::RecordStart()
-{
-	if ( !m_AudioUnit )
-		return false;
-	
-	if ( m_bFirstInit )
-		m_hThread = CreateSimpleThread( StartAudio, this );
-	else 
-		AudioOutputUnitStart( m_AudioUnit );
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-
-	m_bRecordingAudio = true;
-	//printf( "VoiceRecord_AudioQueue::RecordStart\n" );
-	return ( !m_bFirstInit || m_hThread != NULL );
-}
-
-
-void VoiceRecord_AudioQueue::RecordStop()
-{
-	// Stop capturing.
-	if ( m_AudioUnit && m_bRecordingAudio )
-	{
-		AudioOutputUnitStop( m_AudioUnit );
-		//printf( "AudioOutputUnitStop\n" );
-	}
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	m_bRecordingAudio = false;
-
-	if ( m_hThread )
-		ReleaseThreadHandle( m_hThread );
-	m_hThread = NULL;
-}
-
-
-
-OSStatus ComplexBufferFillPlayback( AudioConverterRef            inAudioConverter,
-									UInt32                   *ioNumberDataPackets,
-									AudioBufferList           *ioData,
-									AudioStreamPacketDescription **outDataPacketDesc,
-									void             *inUserData)
-{
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)inUserData;
-	if ( !vr->BRecording() )
-		return noErr;
-
-	if ( vr->m_nMicInputSamplesAvaialble )
-	{
-		int nBytesRequired = *ioNumberDataPackets * vr->m_InputBytesPerPacket;
-		int nBytesAvailable = vr->m_nMicInputSamplesAvaialble*vr->m_InputBytesPerPacket;
-		
-		if ( nBytesRequired < nBytesAvailable )
-		{
-			ioData->mBuffers[0].mData = vr->m_MicInputBuffer.mBuffers[0].mData;
-			ioData->mBuffers[0].mDataByteSize = nBytesRequired;
-			vr->m_MicInputBuffer.mBuffers[0].mData = (char *)vr->m_MicInputBuffer.mBuffers[0].mData+nBytesRequired;
-			vr->m_MicInputBuffer.mBuffers[0].mDataByteSize = nBytesAvailable - nBytesRequired;
-		}
-		else 
-		{
-			ioData->mBuffers[0].mData = vr->m_MicInputBuffer.mBuffers[0].mData;
-			ioData->mBuffers[0].mDataByteSize = nBytesAvailable;
-			vr->m_MicInputBuffer.mBuffers[0].mData = vr->m_pMicInputBuffer;
-			vr->m_MicInputBuffer.mBuffers[0].mDataByteSize = vr->m_MicInputBufferSize;
-		}
-		
-		*ioNumberDataPackets = ioData->mBuffers[0].mDataByteSize / vr->m_InputBytesPerPacket;
-		vr->m_nMicInputSamplesAvaialble = nBytesAvailable / vr->m_InputBytesPerPacket - *ioNumberDataPackets;
-	}
-	else
-	{
-		*ioNumberDataPackets = 0;
-		return -1;
-	}
-	
-	return noErr;
-}
-
-
-
-
-static OSStatus recordingCallback(void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, 
-                                  UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData) 
-{	
-	VoiceRecord_AudioQueue *vr = (VoiceRecord_AudioQueue *)inRefCon;
-	if ( !vr->BRecording() )
-		return noErr;
-	
-	OSStatus err = noErr;
-	if ( vr->m_nMicInputSamplesAvaialble == 0 )
-	{
-		err = AudioUnitRender( vr->GetAudioUnit(), ioActionFlags, inTimeStamp, 1, inNumberFrames, &vr->m_MicInputBuffer );
-		if ( err == noErr )
-			vr->m_nMicInputSamplesAvaialble = vr->m_MicInputBuffer.mBuffers[0].mDataByteSize / vr->m_InputBytesPerPacket;
-	}
-	
-	if ( vr->m_nMicInputSamplesAvaialble > 0 )
-	{
-		UInt32 nConverterSamples = ceil(vr->m_nMicInputSamplesAvaialble/vr->m_flSampleRateConversion);
-		vr->m_ConverterBuffer.mBuffers[0].mDataByteSize = vr->m_ConverterBufferSize;
-		OSStatus err = AudioConverterFillComplexBuffer( vr->GetConverter(),
-													   ComplexBufferFillPlayback, 
-													   vr, 
-													   &nConverterSamples, 
-													   &vr->m_ConverterBuffer, 
-													   NULL );
-		if ( err == noErr || err == -1 )
-			vr->RenderBuffer( (short *)vr->m_ConverterBuffer.mBuffers[0].mData, vr->m_ConverterBuffer.mBuffers[0].mDataByteSize/sizeof(short) );
-	}
-	
-	return err;
-}
-
-
-void VoiceRecord_AudioQueue::RenderBuffer( const short *pszBuf, int nSamples )
-{
-	int samplePos = m_SampleBufferWritePos;
-	int samplePosBefore = samplePos;
-	int readPos = m_SampleBufferReadPos;
-	bool bBeforeRead = false;
-	if ( samplePos <  readPos )
-		bBeforeRead = true;
-	char *pOut = (char *)(m_SampleBuffer + samplePos);
-	int nFirstCopy = MIN( nSamples*sizeof(short), m_SampleBufferSize - samplePos );
-	memcpy( pOut, pszBuf, nFirstCopy );
-	samplePos += nFirstCopy;
-	if ( nSamples*sizeof(short) > nFirstCopy )
-	{
-		nSamples -= ( nFirstCopy / sizeof(short) );
-		samplePos = 0;
-		memcpy( m_SampleBuffer, pszBuf + nFirstCopy, nSamples * sizeof(short) );
-		samplePos += nSamples * sizeof(short);
-	}
-	
-	m_SampleBufferWritePos = samplePos%m_SampleBufferSize;
-	if ( (bBeforeRead && samplePos > readPos) )
-	{
-		m_SampleBufferReadPos = (readPos+m_SampleBufferSize/2)%m_SampleBufferSize; // if we crossed the read pointer then bump it forward
-		//printf( "Crossed %d %d (%d)\n", (int)samplePosBefore, (int)samplePos, readPos );
-	}
-}
-
-
-bool VoiceRecord_AudioQueue::InitalizeInterfaces()
-{	
-	//printf( "Initializing audio queue recorder\n" );
-	// Describe audio component
-	ComponentDescription desc;
-	desc.componentType = kAudioUnitType_Output;
-	desc.componentSubType = kAudioUnitSubType_HALOutput;
-	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
-    desc.componentFlags = 0;
-    desc.componentFlagsMask = 0;
-	
-	Component comp = FindNextComponent(NULL, &desc);
-    if (comp == NULL) 
-		return false;
-	
-	OSStatus status = OpenAComponent(comp, &m_AudioUnit);  
-	if ( status != noErr )
-		return false;
-
-	// Enable IO for recording
-	UInt32 flag = 1;
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Input, 
-								  1, &flag, sizeof(flag));
-	if ( status != noErr )
-		return false;
-
-	// disable output on the device
-	flag = 0;
-	status = AudioUnitSetProperty( m_AudioUnit,kAudioOutputUnitProperty_EnableIO, kAudioUnitScope_Output, 
-						 0, &flag,sizeof(flag));
-	if ( status != noErr )
-		return false;
-
-	UInt32 size = sizeof(AudioDeviceID);	
-    AudioDeviceID inputDevice;
-    status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice,&size, &inputDevice);
-	if ( status != noErr )
-		return false;
-
-    status =AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_CurrentDevice,  kAudioUnitScope_Global, 
-							  0,  &inputDevice, sizeof(inputDevice));
-	if ( status != noErr )
-		return false;
-	
-	// Describe format
-	AudioStreamBasicDescription audioDeviceFormat;
-	size = sizeof(AudioStreamBasicDescription);
-	status = AudioUnitGetProperty( m_AudioUnit,
-								kAudioUnitProperty_StreamFormat,
-								kAudioUnitScope_Input,
-								1,  // input bus 
-								&audioDeviceFormat,
-								&size);
-	
-	if ( status != noErr )
-		return false;
-	
-	// we only want mono audio, so if they have a stero input ask for mono
-	if ( audioDeviceFormat.mChannelsPerFrame == 2 )
-	{
-		audioDeviceFormat.mChannelsPerFrame = 1;
-		audioDeviceFormat.mBytesPerPacket /= 2;
-		audioDeviceFormat.mBytesPerFrame /= 2;
-	}
-	
-	// Apply format
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 
-								  1, &audioDeviceFormat, sizeof(audioDeviceFormat) );
-	if ( status != noErr )
-		return false;
-	
-	AudioStreamBasicDescription audioOutputFormat;
-	audioOutputFormat					= audioDeviceFormat;
-	audioOutputFormat.mFormatID			= kAudioFormatLinearPCM;
-	audioOutputFormat.mFormatFlags		= kAudioFormatFlagIsSignedInteger | kAudioFormatFlagIsPacked;
-    audioOutputFormat.mBytesPerPacket   = 2; // 16-bit samples * 1 channels
-    audioOutputFormat.mFramesPerPacket  = 1;
-    audioOutputFormat.mBytesPerFrame    = 2; // 16-bit samples * 1 channels
-    audioOutputFormat.mChannelsPerFrame = 1;
-    audioOutputFormat.mBitsPerChannel   = 16;
-    audioOutputFormat.mReserved         = 0;
-	
-	audioOutputFormat.mSampleRate = m_nSampleRate;
-	
-	m_flSampleRateConversion = audioDeviceFormat.mSampleRate / audioOutputFormat.mSampleRate;
-	
-	// setup sample rate conversion
-	status = AudioConverterNew( &audioDeviceFormat, &audioOutputFormat, &m_Converter );
-	if ( status != noErr )
-		return false;
-
-	
-	UInt32 primeMethod = kConverterPrimeMethod_None;
-	status = AudioConverterSetProperty( m_Converter, kAudioConverterPrimeMethod, sizeof(UInt32), &primeMethod);
-	if ( status != noErr )
-		return false;
-
-	UInt32 quality = kAudioConverterQuality_Medium;
-	status = AudioConverterSetProperty( m_Converter, kAudioConverterSampleRateConverterQuality, sizeof(UInt32), &quality);
-	if ( status != noErr )
-		return false;
-			
-	// Set input callback
-	AURenderCallbackStruct callbackStruct;
-	callbackStruct.inputProc = recordingCallback;
-	callbackStruct.inputProcRefCon = this;
-	status = AudioUnitSetProperty( m_AudioUnit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Global, 
-								  0,  &callbackStruct, sizeof(callbackStruct) );
-	if ( status != noErr )
-		return false;
-	
-	UInt32 bufferFrameSize;
-	size = sizeof(bufferFrameSize);
-	status = AudioDeviceGetProperty( inputDevice, 1, 1, kAudioDevicePropertyBufferFrameSize, &size, &bufferFrameSize );
-	if ( status != noErr )
-		return false;
-	
-	m_nBufferFrameSize = bufferFrameSize;
-	
-	// allocate the input and conversion sound storage buffers
-	m_MicInputBuffer.mNumberBuffers = 1;
-	m_MicInputBuffer.mBuffers[0].mDataByteSize = m_nBufferFrameSize*audioDeviceFormat.mBitsPerChannel/8*audioDeviceFormat.mChannelsPerFrame;
-	m_MicInputBuffer.mBuffers[0].mData = malloc( m_MicInputBuffer.mBuffers[0].mDataByteSize );
-	m_MicInputBuffer.mBuffers[0].mNumberChannels = audioDeviceFormat.mChannelsPerFrame;
-	m_pMicInputBuffer = m_MicInputBuffer.mBuffers[0].mData;
-	m_MicInputBufferSize = m_MicInputBuffer.mBuffers[0].mDataByteSize;
-	
-	m_InputBytesPerPacket = audioDeviceFormat.mBytesPerPacket;
-
-	m_ConverterBuffer.mNumberBuffers = 1;
-	m_ConverterBuffer.mBuffers[0].mDataByteSize = m_nBufferFrameSize*audioOutputFormat.mBitsPerChannel/8*audioOutputFormat.mChannelsPerFrame;
-	m_ConverterBuffer.mBuffers[0].mData = malloc( m_MicInputBuffer.mBuffers[0].mDataByteSize );
-	m_ConverterBuffer.mBuffers[0].mNumberChannels = 1;
-	
-	m_ConverterBufferSize = m_ConverterBuffer.mBuffers[0].mDataByteSize;
-	
-	m_nMicInputSamplesAvaialble = 0;
-	
-	
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	m_SampleBufferSize = ceil( kNumSecAudioBuffer * m_nSampleRate * audioOutputFormat.mBytesPerPacket );
-	m_SampleBuffer = (char *)malloc( m_SampleBufferSize ); 
-	memset( m_SampleBuffer, 0x0, m_SampleBufferSize );
-
-	DevMsg( "Initialized AudioQueue record interface\n" );
-	return true;
-}
-
-bool VoiceRecord_AudioQueue::Init( int nSampleRate )
-{
-	if ( m_AudioUnit && m_nSampleRate != nSampleRate )
-	{
-		// Need to recreate interfaces with different sample rate
-		ReleaseInterfaces();
-		ClearInterfaces();
-	}
-	m_nSampleRate = nSampleRate;
-
-	// Re-initialize the capture buffer if neccesary
-	if ( !m_AudioUnit )
-	{
-		InitalizeInterfaces();
-	}
-
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-
-	//printf( "VoiceRecord_AudioQueue::Init()\n" );
-	// Initialise
-	OSStatus status = AudioUnitInitialize( m_AudioUnit );
-	if ( status != noErr )
-		return false;
-
-	return true;
-}
-
-
-void VoiceRecord_AudioQueue::ReleaseInterfaces()
-{
-	AudioOutputUnitStop( m_AudioUnit );
-	AudioConverterDispose( m_Converter );
-	AudioUnitUninitialize( m_AudioUnit );
-	m_AudioUnit = NULL;
-	m_Converter = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::ClearInterfaces()
-{
-	m_AudioUnit = NULL;
-	m_Converter = NULL;
-	m_SampleBufferReadPos = m_SampleBufferWritePos = 0;
-	if ( m_SampleBuffer )
-		free( m_SampleBuffer );
-	m_SampleBuffer = NULL;
-
-	if ( m_MicInputBuffer.mBuffers[0].mData )
-		free( m_MicInputBuffer.mBuffers[0].mData );
-	if ( m_ConverterBuffer.mBuffers[0].mData )
-		free( m_ConverterBuffer.mBuffers[0].mData );
-	m_MicInputBuffer.mBuffers[0].mData = NULL;
-	m_ConverterBuffer.mBuffers[0].mData = NULL;
-}
-
-
-void VoiceRecord_AudioQueue::Idle()
-{
-}
-
-
-int VoiceRecord_AudioQueue::GetRecordedData(short *pOut, int nSamples )
-{
-	if ( !m_SampleBuffer )
-		return 0;
-		
-	int cbSamples = nSamples*2; // convert to bytes
-	int writePos = m_SampleBufferWritePos;
-	int readPos = m_SampleBufferReadPos;
-	
-	int nOutstandingSamples = ( writePos - readPos );
-	if ( readPos > writePos ) // writing has wrapped around
-	{
-		nOutstandingSamples = writePos + ( m_SampleBufferSize - readPos );
-	}
-	
-	if ( !nOutstandingSamples ) 
-		return 0;
-
-	if ( nOutstandingSamples < cbSamples )
-		cbSamples = nOutstandingSamples; // clamp to the number of samples we have available
-	
-	memcpy( (char *)pOut, m_SampleBuffer + readPos, MIN( cbSamples, m_SampleBufferSize - readPos ) );
-	if ( cbSamples > ( m_SampleBufferSize - readPos ) )
-	{
-		int offset = m_SampleBufferSize - readPos;
-		cbSamples -= offset;
-		readPos = 0;
-		memcpy( (char *)pOut + offset, m_SampleBuffer, cbSamples );
-	}
-	readPos+=cbSamples;
-	m_SampleBufferReadPos = readPos%m_SampleBufferSize;
-	//printf( "Returning %d samples, %d %d (%d)\n", cbSamples/2, (int)m_SampleBufferReadPos, (int)m_SampleBufferWritePos, m_SampleBufferSize );
-	return cbSamples/2;
-}
-
-
-VoiceRecord_AudioQueue g_AudioQueueVoiceRecord;
-IVoiceRecord* CreateVoiceRecord_AudioQueue( int sampleRate )
-{
-	if ( g_AudioQueueVoiceRecord.Init( sampleRate ) )
-	{
-		return &g_AudioQueueVoiceRecord;
-	}
-	else
-	{
-		g_AudioQueueVoiceRecord.Release();
-		return NULL;
-	}
-}

engine/baseclient.cpp

@@ -706,13 +706,11 @@ bool CBaseClient::SendServerInfo( void )
 	
 	serverinfo.WriteToBuffer( msg );
 
-#ifdef _X360
+	if ( IsX360() && serverinfo.m_nMaxClients > 1 )
-	if ( serverinfo.m_nMaxClients > 1 )
 	{
 		Msg( "Telling clients to connect" );
 		g_pMatchmaking->TellClientsToConnect();
 	}
-#endif
 
 	// send first tick
 	m_nSignonTick = m_Server->m_nTickCount;

engine/cl_demo.cpp

@@ -686,7 +686,7 @@ void CDemoRecorder::CloseDemoFile()
 
 		m_DemoFile.Close();
 
-		if( g_ClientDLL ) g_ClientDLL->OnDemoRecordStop();
+		g_ClientDLL->OnDemoRecordStop();
 	}
 
 	m_bCloseDemoFile = false;

engine/cl_null.cpp

@@ -6,7 +6,6 @@
 
 #include "client_pch.h"
 #ifdef SWDS
-#include "igame.h"
 #include "hltvclientstate.h"
 #include "convar.h"
 #include "enginestats.h"
@@ -38,9 +37,9 @@ bool CL_IsPortalDemo()
 
 bool HandleRedirectAndDebugLog( const char *msg );
 
-//void BeginLoadingUpdates( MaterialNonInteractiveMode_t mode ) {}
+void BeginLoadingUpdates( MaterialNonInteractiveMode_t mode ) {}
-//void EndLoadingUpdates() {}
 void RefreshScreenIfNecessary() {}
+void EndLoadingUpdates() {}
 
 
 void Con_ColorPrintf( const Color& clr, const char *fmt, ... )

engine/cmodel.cpp

@@ -873,9 +873,9 @@ bool IntersectRayWithBoxBrush( TraceInfo_t *pTraceInfo, const cbrush_t *pBrush,
 	FPExceptionDisabler hideExceptions;
 
 	// Load the unaligned ray/box parameters into SIMD registers
-	fltx4 start = LoadAlignedSIMD(pTraceInfo->m_start.Base());
+	fltx4 start = LoadUnaligned3SIMD(pTraceInfo->m_start.Base());
-	fltx4 extents = LoadAlignedSIMD(pTraceInfo->m_extents.Base());
+	fltx4 extents = LoadUnaligned3SIMD(pTraceInfo->m_extents.Base());
-	fltx4 delta = LoadAlignedSIMD(pTraceInfo->m_delta.Base());
+	fltx4 delta = LoadUnaligned3SIMD(pTraceInfo->m_delta.Base());
 	fltx4 boxMins = LoadAlignedSIMD( pBox->mins.Base() );
 	fltx4 boxMaxs = LoadAlignedSIMD( pBox->maxs.Base() );
 
@@ -899,7 +899,7 @@ bool IntersectRayWithBoxBrush( TraceInfo_t *pTraceInfo, const cbrush_t *pBrush,
 
 	fltx4 crossPlane = OrSIMD(XorSIMD(startOutMins,endOutMins), XorSIMD(startOutMaxs,endOutMaxs));
 	// now build the per-axis interval of t for intersections
-	fltx4 invDelta = LoadAlignedSIMD(pTraceInfo->m_invDelta.Base());
+	fltx4 invDelta = LoadUnaligned3SIMD(pTraceInfo->m_invDelta.Base());
 	fltx4 tmins = MulSIMD( offsetMinsExpanded, invDelta );
 	fltx4 tmaxs = MulSIMD( offsetMaxsExpanded, invDelta );
 	// now sort the interval per axis
@@ -1037,9 +1037,9 @@ bool IntersectRayWithBox( const Ray_t &ray, const VectorAligned &inInvDelta, con
 	pTrace->fraction = 1.0f;
 
 	// Load the unaligned ray/box parameters into SIMD registers
-	fltx4 start = LoadAlignedSIMD(ray.m_Start.Base());
+	fltx4 start = LoadUnaligned3SIMD(ray.m_Start.Base());
-	fltx4 extents = LoadAlignedSIMD(ray.m_Extents.Base());
+	fltx4 extents = LoadUnaligned3SIMD(ray.m_Extents.Base());
-	fltx4 delta = LoadAlignedSIMD(ray.m_Delta.Base());
+	fltx4 delta = LoadUnaligned3SIMD(ray.m_Delta.Base());
 	fltx4 boxMins = LoadAlignedSIMD( inBoxMins.Base() );
 	fltx4 boxMaxs = LoadAlignedSIMD( inBoxMaxs.Base() );
 
@@ -1372,9 +1372,9 @@ void FASTCALL CM_ClipBoxToBrush( TraceInfo_t * RESTRICT pTraceInfo, const cbrush
 
 inline bool IsTraceBoxIntersectingBoxBrush( TraceInfo_t *pTraceInfo, cboxbrush_t *pBox )
 {
-	fltx4 start = LoadAlignedSIMD(pTraceInfo->m_start.Base());
+	fltx4 start = LoadUnaligned3SIMD(pTraceInfo->m_start.Base());
-	fltx4 mins = LoadAlignedSIMD(pTraceInfo->m_mins.Base());
+	fltx4 mins = LoadUnaligned3SIMD(pTraceInfo->m_mins.Base());
-	fltx4 maxs = LoadAlignedSIMD(pTraceInfo->m_maxs.Base());
+	fltx4 maxs = LoadUnaligned3SIMD(pTraceInfo->m_maxs.Base());
 
 	fltx4 boxMins = LoadAlignedSIMD( pBox->mins.Base() );
 	fltx4 boxMaxs = LoadAlignedSIMD( pBox->maxs.Base() );
@@ -1569,15 +1569,15 @@ void FASTCALL CM_TraceToLeaf( TraceInfo_t * RESTRICT pTraceInfo, int ndxLeaf, fl
 		if (IsX360())
 		{
 			// set up some relatively constant variables we'll use in the loop below
-			fltx4 traceStart = LoadAlignedSIMD(pTraceInfo->m_start.Base());
+			fltx4 traceStart = LoadUnaligned3SIMD(pTraceInfo->m_start.Base());
-			fltx4 traceDelta = LoadAlignedSIMD(pTraceInfo->m_delta.Base());
+			fltx4 traceDelta = LoadUnaligned3SIMD(pTraceInfo->m_delta.Base());
-			fltx4 traceInvDelta = LoadAlignedSIMD(pTraceInfo->m_invDelta.Base());
+			fltx4 traceInvDelta = LoadUnaligned3SIMD(pTraceInfo->m_invDelta.Base());
 			static const fltx4 vecEpsilon = {DISPCOLL_DIST_EPSILON,DISPCOLL_DIST_EPSILON,DISPCOLL_DIST_EPSILON,DISPCOLL_DIST_EPSILON};
 			// only used in !IS_POINT version:
 			fltx4 extents;
 			if (!IS_POINT)
 			{
-				extents = LoadAlignedSIMD(pTraceInfo->m_extents.Base());
+				extents = LoadUnaligned3SIMD(pTraceInfo->m_extents.Base());
 			}
 
 			// TODO: this loop probably ought to be unrolled so that we can make a more efficient

engine/cmodel_private.h

@@ -42,13 +42,13 @@ struct TraceInfo_t
 		m_nCheckDepth = -1;
 	}
 
-	VectorAligned m_start;
+	Vector m_start;
-	VectorAligned m_end;
+	Vector m_end;
-	VectorAligned m_mins;
+	Vector m_mins;
-	VectorAligned m_maxs;
+	Vector m_maxs;
-	VectorAligned m_extents;
+	Vector m_extents;
-	VectorAligned m_delta;
+	Vector m_delta;
-	VectorAligned m_invDelta;
+	Vector m_invDelta;
 
 	trace_t m_trace;
 	trace_t m_stabTrace;

engine/common.cpp

@@ -97,19 +97,22 @@ COM_ExplainDisconnection
 */
 void COM_ExplainDisconnection( bool bPrint, const char *fmt, ... )
 {
-#ifdef _X360
+	if ( IsX360() )
-	g_pMatchmaking->SessionNotification( SESSION_NOTIFY_LOST_SERVER );
+	{
-#else
+		g_pMatchmaking->SessionNotification( SESSION_NOTIFY_LOST_SERVER );
-	va_list		argptr;
+	}
-	char		string[1024];
+	else
+	{
+		va_list		argptr;
+		char		string[1024];
 
-	va_start (argptr, fmt);
+		va_start (argptr, fmt);
-	Q_vsnprintf(string, sizeof( string ), fmt,argptr);
+		Q_vsnprintf(string, sizeof( string ), fmt,argptr);
-	va_end (argptr);
+		va_end (argptr);
 
-	Q_strncpy( gszDisconnectReason, string, 256 );
+		Q_strncpy( gszDisconnectReason, string, 256 );
-	gfExtendedError = true;
+		gfExtendedError = true;
-#endif
+	}
 
 	if ( bPrint )
 	{
@@ -143,18 +146,21 @@ COM_ExtendedExplainDisconnection
 */
 void COM_ExtendedExplainDisconnection( bool bPrint, const char *fmt, ... )
 {
-#ifdef _X360
+	if ( IsX360() )
-	g_pMatchmaking->SessionNotification( SESSION_NOTIFY_LOST_SERVER );
+	{
-#else
+		g_pMatchmaking->SessionNotification( SESSION_NOTIFY_LOST_SERVER );
-	va_list		argptr;
+	}
-	char		string[1024];
+	else
+	{
+		va_list		argptr;
+		char		string[1024];
+		
+		va_start (argptr, fmt);
+		Q_vsnprintf(string, sizeof( string ), fmt,argptr);
+		va_end (argptr);
 
-	va_start (argptr, fmt);
+		Q_strncpy( gszExtendedDisconnectReason, string, 256 );
-	Q_vsnprintf(string, sizeof( string ), fmt,argptr);
+	}
-	va_end (argptr);
-
-	Q_strncpy( gszExtendedDisconnectReason, string, 256 );
-#endif
 
 	if ( bPrint )
 	{

engine/downloadthread.cpp

@@ -921,7 +921,7 @@ void DownloadThread( void *voidPtr )
 	// Delete rc.data, which was allocated in this thread
 	if ( rc.data != NULL )
 	{
-		free(rc.data);
+		delete[] rc.data;
 		rc.data = NULL;
 	}
 	

engine/host.cpp

@@ -3500,12 +3500,10 @@ void _Host_RunFrame (float time)
 			//-------------------
 			_Host_RunFrame_Sound();
 
-#ifndef DEDICATED
 			if ( g_bVCRSingleStep )
 			{
 				VCR_EnterPausedState();
 			}
-#endif
 		}
 		else
 		{

engine/l_studio.cpp

@@ -4353,20 +4353,20 @@ ModelInstanceHandle_t CModelRender::CreateInstance( IClientRenderable *pRenderab
 
 		// validate static color meshes once, now at load/create time
 		ValidateStaticPropColorData( handle );
-
+	
 		// 360 persists the color meshes across same map loads
-#ifdef _X360
+		if ( !IsX360() || instance.m_ColorMeshHandle == DC_INVALID_HANDLE )
-		if ( r_decalstaticprops.GetBool() && instance.m_LightCacheHandle )
-			instance.m_AmbientLightingState = *(LightcacheGetStatic( *pCache, NULL, LIGHTCACHEFLAGS_STATIC ));
-#else
-		if ( instance.m_ColorMeshHandle == DC_INVALID_HANDLE )
 		{
 			// builds out color meshes or loads disk colors, now at load/create time
 			RecomputeStaticLighting( handle );
 		}
-#endif
+		else
+			if ( r_decalstaticprops.GetBool() && instance.m_LightCacheHandle )
+			{
+				instance.m_AmbientLightingState = *(LightcacheGetStatic( *pCache, NULL, LIGHTCACHEFLAGS_STATIC ));
+			}
 	}
-
+	
 	return handle;
 }
 

engine/masterserver.cpp

@@ -31,8 +31,7 @@ extern ConVar sv_lan;
 static char g_MasterServers[][64] =
 {
 	"185.192.97.130:27010",
-	"168.138.92.21:27016",
+	"168.138.92.21:27016"
-	"135.125.188.162:27010"
 };
 
 #ifdef DEDICATED

engine/pure_server.cpp

@@ -226,7 +226,7 @@ bool CPureServerWhitelist::LoadCommandsFromKeyValues( KeyValues *kv )
 			else
 				Warning( "Unknown modifier in whitelist file: %s.\n", mods[i] );
 		}
-		mods.PurgeAndDeleteElementsArray();
+		mods.PurgeAndDeleteElements();
 		if (
 			( bFromTrustedSource && ( bAllowFromDisk || bCheckCRC || bAny ) )
 			|| ( bAny && bCheckCRC ) )

engine/spatialpartition.cpp

@@ -987,7 +987,7 @@ private:
 	int m_iTree;
 };
 
-/*
+
 class CIntersectPoint : public CPartitionVisitor
 {
 public:
@@ -1009,7 +1009,7 @@ public:
 private:
 	fltx4 m_f4Point;
 };
-*/
+
 
 class CIntersectBox : public CPartitionVisitor
 {
@@ -1040,8 +1040,8 @@ class CIntersectRay : public CPartitionVisitor
 public:
 	CIntersectRay( CVoxelTree *pPartition, const Ray_t &ray, const Vector &vecInvDelta ) : CPartitionVisitor( pPartition )
 	{
-		m_f4Start = LoadAlignedSIMD( ray.m_Start.Base() );
+		m_f4Start = LoadUnaligned3SIMD( ray.m_Start.Base() );
-		m_f4Delta = LoadAlignedSIMD( ray.m_Delta.Base() );
+		m_f4Delta = LoadUnaligned3SIMD( ray.m_Delta.Base() );
 		m_f4InvDelta = LoadUnaligned3SIMD( vecInvDelta.Base() );
 	}
 
@@ -1069,10 +1069,10 @@ class CIntersectSweptBox : public CPartitionVisitor
 public:
 	CIntersectSweptBox( CVoxelTree *pPartition, const Ray_t &ray, const Vector &vecInvDelta ) : CPartitionVisitor( pPartition )
 	{
-		m_f4Start = LoadAlignedSIMD( ray.m_Start.Base() );
+		m_f4Start = LoadUnaligned3SIMD( ray.m_Start.Base() );
-		m_f4Delta = LoadAlignedSIMD( ray.m_Delta.Base() );
+		m_f4Delta = LoadUnaligned3SIMD( ray.m_Delta.Base() );
-		m_f4Extents = LoadAlignedSIMD( ray.m_Extents.Base() );
 		m_f4InvDelta = LoadUnaligned3SIMD( vecInvDelta.Base() );
+		m_f4Extents = LoadUnaligned3SIMD( ray.m_Extents.Base() );
 	}
 
 	bool Intersects( const float *pMins, const float *pMaxs ) const

engine/staticpropmgr.cpp

@@ -1339,6 +1339,7 @@ void CStaticPropMgr::UnserializeModels( CUtlBuffer& buf )
 			case 5: UnserializeLump<StaticPropLumpV5_t>(&lump, buf); break;
 			case 6: UnserializeLump<StaticPropLumpV6_t>(&lump, buf); break;
 			case 7: // Falls down to version 10. We promoted TF to version 10 to deal with SFM. 
+			case 9: UnserializeLump<StaticPropLumpV9_t>(&lump, buf); break;
 			case 10:
 			{
 				if( s_MapVersion == 21 )
@@ -1347,8 +1348,7 @@ void CStaticPropMgr::UnserializeModels( CUtlBuffer& buf )
 					UnserializeLump<StaticPropLumpV10_t>(&lump, buf);
 				break;
 			}
-			case 9: UnserializeLump<StaticPropLumpV9_t>(&lump, buf); break;
+			case 11: UnserializeLump<StaticPropLumpV11_t>(&lump, buf);
-			case 11: UnserializeLump<StaticPropLumpV11_t>(&lump, buf); break;
 			default:
 				Assert("Unexpected version while deserializing lumps.");
 		}

engine/sv_main.cpp

@@ -1227,7 +1227,7 @@ void SV_DetermineMulticastRecipients( bool usepas, const Vector& origin, CBitVec
 		serverGameClients->ClientEarPosition( pClient->edict, &vecEarPosition );
 
 		int iBitNumber = CM_LeafCluster( CM_PointLeafnum( vecEarPosition ) );
-		if ( iBitNumber < 0 || !(pMask[iBitNumber>>3] & (1<<(iBitNumber&7)) ) )
+		if ( !(pMask[iBitNumber>>3] & (1<<(iBitNumber&7)) ) )
 			continue;
 
 		playerbits.Set( i );

engine/sys_dll.cpp

@@ -1534,7 +1534,7 @@ void Sys_NoCrashDialog()
 
 void Sys_TestSendKey( const char *pKey )
 {
-#if defined(_WIN32) && !defined(USE_SDL) && !defined(_XBOX) && !defined(DEDICATED)
+#if defined(_WIN32) && !defined(USE_SDL) && !defined(_XBOX)
 	int key = pKey[0];
 	if ( pKey[0] == '\\' && pKey[1] == 'r' )
 	{

engine/sys_mainwind.cpp

@@ -263,6 +263,7 @@ GameMessageHandler_t g_GameMessageHandlers[] =
 	{ IE_Quit,					&CGame::HandleMsg_Close },
 };
 
+
 void CGame::AppActivate( bool fActive )
 {
 	// If text mode, force it to be active.
@@ -298,18 +299,8 @@ void CGame::AppActivate( bool fActive )
 			// Clear keyboard states (should be cleared already but...)
 			// VGui_ActivateMouse will reactivate the mouse soon.
 			ClearIOStates();
+			
 			UpdateMaterialSystemConfig();
-
-#ifdef ANDROID
-			ConVarRef mat_queue_mode( "mat_queue_mode" );
-
-			// Hack to reset internal queue buffers
-			int nSavedQueueMode = mat_queue_mode.GetInt();
-			mat_queue_mode.SetValue( 0 );
-			materials->BeginFrame( host_frametime );
-			materials->EndFrame();
-			mat_queue_mode.SetValue( nSavedQueueMode );
-#endif
 		}
 		else
 		{
@@ -364,7 +355,7 @@ void CGame::HandleMsg_Close( const InputEvent_t &event )
 
 void CGame::DispatchInputEvent( const InputEvent_t &event )
 {
-	switch( event.m_nType )
+	switch( event.m_nType & 0xFFFF )
 	{
 	// Handle button events specially, 
 	// since we have all manner of crazy filtering going on	when dealing with them

engine/vengineserver_impl.cpp

@@ -1842,7 +1842,7 @@ void CVEngineServer::PlaybackTempEntity( IRecipientFilter& filter, float delay,
 
 	newEvent->bits = buffer.GetNumBitsWritten();
 	int size = Bits2Bytes( buffer.GetNumBitsWritten() );
-	newEvent->pData = new byte[ALIGN_VALUE(size,4)];
+	newEvent->pData = new byte[size];
 	Q_memcpy( newEvent->pData, data, size );
 
 	// add to list

engine/vgui_drawtreepanel.cpp

@@ -268,7 +268,7 @@ public:
 
 			if ( data )
 			{
-				g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetPtr( "PanelPtr", 0 ) : 0;
+				g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetInt( "PanelPtr", 0 ) : 0;
 			}
 			else
 			{
@@ -388,7 +388,7 @@ void VGui_RecursivePrintTree(
 		Q_snprintf( str, sizeof( str ), "%s", name );
 
 	pVal->SetString( "Text", str );
-	pVal->SetPtr( "PanelPtr", (void*)current );
+	pVal->SetInt( "PanelPtr", current );
 
 	pNewParent = pVal;
 
@@ -417,7 +417,7 @@ bool UpdateItemState(
 	vgui::IPanel *ipanel = vgui::ipanel();
 
 	KeyValues *pItemData = pTree->GetItemData( iChildItemId );
-	if ( pItemData->GetPtr( "PanelPtr" ) != pSub->GetPtr( "PanelPtr" ) ||
+	if ( pItemData->GetInt( "PanelPtr" ) != pSub->GetInt( "PanelPtr" ) ||
 		Q_stricmp( pItemData->GetString( "Text" ), pSub->GetString( "Text" ) ) != 0 )
 	{
 		pTree->ModifyItem( iChildItemId, pSub );
@@ -425,7 +425,7 @@ bool UpdateItemState(
 	}
 
 	// Ok, this is a new panel.
-	vgui::VPANEL vPanel = (vgui::VPANEL)pSub->GetPtr( "PanelPtr" );
+	vgui::VPANEL vPanel = pSub->GetInt( "PanelPtr" );
 
 	int iBaseColor[3] = { 255, 255, 255 };
 	if ( ipanel->IsPopup( vPanel ) )
@@ -433,7 +433,7 @@ bool UpdateItemState(
 		iBaseColor[0] = 255;	iBaseColor[1] = 255;	iBaseColor[2] = 0;
 	}
 
-	if ( g_FocusPanelList.Find( vPanel ) != vgui::INVALID_PANEL )
+	if ( g_FocusPanelList.Find( vPanel ) != -1 )
 	{
 		iBaseColor[0] = 0;		iBaseColor[1] = 255;	iBaseColor[2] = 0;
 		pTree->ExpandItem( iChildItemId, true );

engine/wscript

@@ -212,24 +212,25 @@ def build(bld):
 		]
 		if bld.env.DEST_OS != "darwin":
 			source += ['audio/snd_dev_sdl.cpp']
-
+	
-	source_win = [
-		'audio/snd_dev_direct.cpp',
-		'audio/snd_dev_wave.cpp',
-		'audio/voice_mixer_controls.cpp',
-		'audio/voice_record_dsound.cpp'
-	]
 
 	if bld.env.DEST_OS == 'win32':
-		source += ['../public/tier0/memoverride.cpp']
+		source += [	
+			'../public/tier0/memoverride.cpp',
+			'audio/snd_dev_direct.cpp',
+			'audio/snd_dev_wave.cpp',
+			'audio/voice_mixer_controls.cpp',
+			'audio/voice_record_dsound.cpp',
+		]
 	else:
-		source += ['audio/snd_posix.cpp']
+		source += [
+			'sys_linuxwind.cpp',
+			'audio/snd_posix.cpp',
+		]
 
 	if bld.env.DEDICATED:
-		source += ['cl_null.cpp', 'sys_stubwind.cpp']
+		source += ['cl_null.cpp']
 	else:
-		source += source_win if bld.env.DEST_OS == 'win32' else ['sys_stubwind.cpp']
-
 		source += [
 			'client_pch.cpp',
 			'cl_rcon.cpp',
@@ -340,8 +341,7 @@ def build(bld):
 		if bld.env.DEST_OS == 'darwin':
 			source += [
 				'audio/snd_dev_openal.cpp', # [$OSXALL]
-				'audio/snd_dev_mac_audioqueue.cpp',#	[$OSXALL]
+				'audio/snd_dev_mac_audioqueue.cpp', # [$OSXALL]
-				'audio/voice_record_mac_audioqueue.cpp',	#[$OSXALL]
 			]
 
 	includes = [

filesystem/basefilesystem.cpp

@@ -4203,7 +4203,7 @@ bool CBaseFileSystem::FindNextFileInVPKOrPakHelper( FindData_t *pFindData )
 	{
 		V_strncpy( pFindData->findData.cFileName, V_UnqualifiedFileName( pFindData->m_fileMatchesFromVPKOrPak[0] ), sizeof( pFindData->findData.cFileName ) );
 		pFindData->findData.dwFileAttributes = 0;
-		delete[] pFindData->m_fileMatchesFromVPKOrPak.Head();
+		delete pFindData->m_fileMatchesFromVPKOrPak.Head();
 		pFindData->m_fileMatchesFromVPKOrPak.RemoveMultipleFromHead( 1 );
 
 		return true;

game/client/cdll_client_int.cpp

@@ -729,7 +729,7 @@ public:
 	void PrecacheMaterial( const char *pMaterialName );
 
 	virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar );
-	virtual void IN_TouchEvent( int type, int fingerId, int x, int y );
+	virtual void IN_TouchEvent( uint data, uint data2, uint data3, uint data4 );
 
 private:
 	void UncacheAllMaterials( );
@@ -1631,7 +1631,6 @@ void CHLClient::LevelInitPreEntity( char const* pMapName )
 	g_RagdollLVManager.SetLowViolence( pMapName );
 
 	gHUD.LevelInit();
-	gTouch.LevelInit();
 
 #if defined( REPLAY_ENABLED )
 	// Initialize replay ragdoll recorder
@@ -2638,20 +2637,24 @@ CSteamID GetSteamIDForPlayerIndex( int iPlayerIndex )
 #endif
 
  
-void CHLClient::IN_TouchEvent( int type, int fingerId, int x, int y )
+void CHLClient::IN_TouchEvent( uint data, uint data2, uint data3, uint data4 )
 {
 	if( enginevgui->IsGameUIVisible() )
 		return;
 
 	touch_event_t ev;
 
-	ev.type = type;
+	ev.type = data & 0xFFFF;
-	ev.fingerid = fingerId;
+	ev.fingerid = (data >> 16) & 0xFFFF;
-	memcpy( &ev.x, &x, sizeof(ev.x) );
+	ev.x = (double)((data2 >> 16) & 0xFFFF)  / 0xFFFF;
-	memcpy( &ev.y, &y, sizeof(ev.y) );
+	ev.y = (double)(data2 & 0xFFFF) / 0xFFFF;
 
-	if( type == IE_FingerMotion )
+	union{uint i;float f;} ifconv;
-		inputsystem->GetTouchAccumulators( fingerId, ev.dx, ev.dy );
+	ifconv.i = data3;
+	ev.dx = ifconv.f;
+
+	ifconv.i = data4;
+	ev.dy = ifconv.f;
 
 	gTouch.ProcessEvent( &ev );
 }

game/client/cstrike/cs_hud_health.cpp

@@ -72,7 +72,7 @@ DECLARE_HUDELEMENT( CHudHealth );
 //-----------------------------------------------------------------------------
 // Purpose: Constructor
 //-----------------------------------------------------------------------------
-CHudHealth::CHudHealth( const char *pElementName ) : CHudElement( pElementName ), CHudNumericDisplay(NULL, "HudHealth"), m_pHealthIcon( NULL )
+CHudHealth::CHudHealth( const char *pElementName ) : CHudElement( pElementName ), CHudNumericDisplay(NULL, "HudHealth")
 {
 	SetHiddenBits( HIDEHUD_HEALTH | HIDEHUD_PLAYERDEAD );
 }
@@ -172,4 +172,4 @@ void CHudHealth::Paint( void )
 
 	//draw the health icon
 	BaseClass::Paint();
-}
+}

game/client/cstrike/cs_view_scene.cpp

@@ -152,13 +152,13 @@ void CCSViewRender::PerformNightVisionEffect( const CViewSetup &view )
 			render->ViewDrawFade( overlaycolor, pMaterial );
 
 			// Only one pass in DX7.
-/*			if ( g_pMaterialSystemHardwareConfig->GetDXSupportLevel() >= 80 )
+			if ( g_pMaterialSystemHardwareConfig->GetDXSupportLevel() >= 80 )
 			{
 				CMatRenderContextPtr pRenderContext( materials );
 				pRenderContext->DrawScreenSpaceQuad( pMaterial );
 				render->ViewDrawFade( overlaycolor, pMaterial );
 				pRenderContext->DrawScreenSpaceQuad( pMaterial );
-			}*/
+			}
 		}
 	}
 }
@@ -211,7 +211,6 @@ void CCSViewRender::PerformFlashbangEffect( const CViewSetup &view )
 		render->ViewDrawFade( overlaycolor, pMaterial );
 
 		// just do one pass for dxlevel < 80.
-/*
 		if (g_pMaterialSystemHardwareConfig->GetDXSupportLevel() >= 80)
 		{
 			pRenderContext->DrawScreenSpaceRectangle( pMaterial, view.x, view.y, view.width, view.height,
@@ -222,7 +221,6 @@ void CCSViewRender::PerformFlashbangEffect( const CViewSetup &view )
 				0, 0, m_pFlashTexture->GetActualWidth()-1, m_pFlashTexture->GetActualHeight()-1, 
 				m_pFlashTexture->GetActualWidth(), m_pFlashTexture->GetActualHeight() );
 		}
-*/
 	}
 	else if ( m_pFlashTexture )
 	{
@@ -235,7 +233,7 @@ void CCSViewRender::PerformFlashbangEffect( const CViewSetup &view )
 		render->ViewDrawFade( overlaycolor, pMaterial );
 
 		// just do one pass for dxlevel < 80.
-/*		if (g_pMaterialSystemHardwareConfig->GetDXSupportLevel() >= 80)
+		if (g_pMaterialSystemHardwareConfig->GetDXSupportLevel() >= 80)
 		{
 			pRenderContext->DrawScreenSpaceRectangle( pMaterial, view.x, view.y, view.width, view.height,
 				0, 0, m_pFlashTexture->GetActualWidth()-1, m_pFlashTexture->GetActualHeight()-1, 
@@ -244,7 +242,7 @@ void CCSViewRender::PerformFlashbangEffect( const CViewSetup &view )
 			pRenderContext->DrawScreenSpaceRectangle( pMaterial, view.x, view.y, view.width, view.height,
 				0, 0, m_pFlashTexture->GetActualWidth()-1, m_pFlashTexture->GetActualHeight()-1, 
 				m_pFlashTexture->GetActualWidth(), m_pFlashTexture->GetActualHeight() );
-		}*/
+		}
 	}
 
 	// this does the pure white overlay part of the flashbang effect.

game/client/cstrike/hud_armor.cpp

@@ -47,7 +47,7 @@ private:
 DECLARE_HUDELEMENT( CHudArmor );
 
 
-CHudArmor::CHudArmor( const char *pName ) : CHudNumericDisplay( NULL, "HudArmor" ), CHudElement( pName ), m_pArmorIcon( NULL )
+CHudArmor::CHudArmor( const char *pName ) : CHudNumericDisplay( NULL, "HudArmor" ), CHudElement( pName )
 {
 	SetHiddenBits( HIDEHUD_HEALTH | HIDEHUD_PLAYERDEAD );
 }

game/client/game_controls/teammenu.cpp

@@ -115,7 +115,7 @@ void CTeamMenu::ApplySchemeSettings(IScheme *pScheme)
 
 	if ( *m_szMapName )
 	{
-		LoadMapPage( NULL ); // reload the map description to pick up the color
+		LoadMapPage( m_szMapName ); // reload the map description to pick up the color
 	}
 }
 
@@ -185,23 +185,22 @@ void CTeamMenu::Update()
 void CTeamMenu::LoadMapPage( const char *mapName )
 {
 	// Save off the map name so we can re-load the page in ApplySchemeSettings().
-	if( mapName )
+	Q_strncpy( m_szMapName, mapName, strlen( mapName ) + 1 );
-		Q_strncpy( m_szMapName, mapName, strlen( mapName ) + 1 );
+	
-
 	char mapRES[ MAX_PATH ];
 
 	char uilanguage[ 64 ];
 	uilanguage[0] = 0;
 	engine->GetUILanguage( uilanguage, sizeof( uilanguage ) );
 
-	Q_snprintf( mapRES, sizeof( mapRES ), "resource/maphtml/%s_%s.html", m_szMapName, uilanguage );
+	Q_snprintf( mapRES, sizeof( mapRES ), "resource/maphtml/%s_%s.html", mapName, uilanguage );
 
 	bool bFoundHTML = false;
 
 	if ( !g_pFullFileSystem->FileExists( mapRES ) )
 	{
 		// try english
-		Q_snprintf( mapRES, sizeof( mapRES ), "resource/maphtml/%s_english.html", m_szMapName );
+		Q_snprintf( mapRES, sizeof( mapRES ), "resource/maphtml/%s_english.html", mapName );
 	}
 	else
 	{
@@ -241,7 +240,7 @@ void CTeamMenu::LoadMapPage( const char *mapName )
 #endif
 	}
 
-	Q_snprintf( mapRES, sizeof( mapRES ), "maps/%s.txt", m_szMapName);
+	Q_snprintf( mapRES, sizeof( mapRES ), "maps/%s.txt", mapName);
 
 	// if no map specific description exists, load default text
 	if( !g_pFullFileSystem->FileExists( mapRES ) )

game/client/touch.cpp

@@ -313,7 +313,7 @@ void CTouchControls::ResetToDefaults()
 {
 	rgba_t color(255, 255, 255, 155);
 	char buf[MAX_PATH];
-	gridcolor = rgba_t(255, 0, 0, 30);
+	gridcolor = rgba_t(255, 0, 0, 50);
 
 	RemoveButtons();
 
@@ -372,7 +372,7 @@ void CTouchControls::Init()
 	mouse_events = 0;
 	move_start_x = move_start_y = 0.0f;
 	m_flPreviousYaw = m_flPreviousPitch = 0.f;
-	gridcolor = rgba_t(255, 0, 0, 30);
+	gridcolor = rgba_t(255, 0, 0, 50);
 
 	m_bCutScene = false;
 	showtexture = hidetexture = resettexture = closetexture = joytexture = 0;
@@ -425,13 +425,6 @@ void CTouchControls::Init()
 	initialized = true;
 }
 
-void CTouchControls::LevelInit()
-{
-	m_bCutScene = false;
-	m_AlphaDiff = 0;
-	m_flHideTouch = 0;
-}
-
 int nextPowerOfTwo(int x)
 {
 	if( (x & (x - 1)) == 0)
@@ -659,8 +652,6 @@ void CTouchControls::Paint()
 
 	CUtlLinkedList<CTouchButton*>::iterator it;
 
-	const rgba_t buttonEditClr = rgba_t( 61, 153, 0, 40 );
-
 	if( state == state_edit )
 	{
 		vgui::surface()->DrawSetColor(gridcolor.r, gridcolor.g, gridcolor.b, gridcolor.a*3); // 255, 0, 0, 200 <- default here
@@ -687,7 +678,7 @@ void CTouchControls::Paint()
 					g_pMatSystemSurface->DrawColoredText( 2, btn->x1*screen_w, btn->y1*screen_h+40, 255, 255, 255, 255, "RGBA: %d %d %d %d", btn->color.r, btn->color.g, btn->color.b, btn->color.a );// color
 				}
 
-				vgui::surface()->DrawSetColor(buttonEditClr.r, buttonEditClr.g, buttonEditClr.b, buttonEditClr.a); // 255, 0, 0, 50 <- default here
+				vgui::surface()->DrawSetColor(gridcolor.r, gridcolor.g, gridcolor.b, gridcolor.a); // 255, 0, 0, 50 <- default here
 				vgui::surface()->DrawFilledRect( btn->x1*screen_w, btn->y1*screen_h, btn->x2*screen_w, btn->y2*screen_h );
 			}
 		}

game/client/touch.h

@@ -161,7 +161,6 @@ class CTouchControls
 {
 public:
 	void Init( );
-	void LevelInit( );
 	void Shutdown( );
 
 	void Paint( );

game/shared/cstrike/cs_gamemovement.cpp

@@ -28,7 +28,7 @@ extern bool g_bMovementOptimizations;
 
 ConVar sv_timebetweenducks( "sv_timebetweenducks", "0", FCVAR_REPLICATED, "Minimum time before recognizing consecutive duck key", true, 0.0, true, 2.0 );
 ConVar sv_enableboost( "sv_enableboost", "0", FCVAR_REPLICATED | FCVAR_NOTIFY, "Allow boost exploits");
-ConVar cs_autojump( "cs_autojump", "0", FCVAR_REPLICATED | FCVAR_NOTIFY );
+
 
 class CCSGameMovement : public CGameMovement
 {
@@ -691,11 +691,8 @@ bool CCSGameMovement::CheckJumpButton( void )
 		return false;		// in air, so no effect
 	}
 
-	if ( (mv->m_nOldButtons & IN_JUMP) &&
+	if ( mv->m_nOldButtons & IN_JUMP )
-		(!cs_autojump.GetBool() && m_pCSPlayer->GetGroundEntity()) )
-	{
 		return false;		// don't pogo stick
-	}
 
 	if ( !sv_enablebunnyhopping.GetBool() )
 	{

game/shared/multiplay_gamerules.cpp

@@ -1151,14 +1151,12 @@ ConVarRef suitcharger( "sk_suitcharger" );
 
 	void StripChar(char *szBuffer, const char cWhiteSpace )
 	{
-		char *src, *dst;
 
-		for (src = dst = szBuffer; *src != '\0'; src++)
+		while ( char *pSpace = strchr( szBuffer, cWhiteSpace ) )
 		{
-			*dst = *src;
+			char *pNextChar = pSpace + sizeof(char);
-			if (*dst != cWhiteSpace) dst++;
+			V_strcpy( pSpace, pNextChar );
 		}
-		*dst = '\0';
 	}
 
 	void CMultiplayRules::GetNextLevelName( char *pszNextMap, int bufsize, bool bRandom /* = false */ )

gameui/OptionsSubVideo.cpp

@@ -508,7 +508,7 @@ public:
 		if ( panel == m_pDXLevel && RequiresRestart() )
 		{
 			// notify the user that this will require a disconnect
-			QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info", this);
+			QueryBox *box = new QueryBox("#GameUI_SettingRequiresDisconnect_Title", "#GameUI_SettingRequiresDisconnect_Info");
 			box->AddActionSignalTarget( this );
 			box->SetCancelCommand(new KeyValues("ResetDXLevelCombo"));
 			box->DoModal();

inputsystem/inputsystem.cpp

@@ -1530,6 +1530,16 @@ bool CInputSystem::GetRawMouseAccumulators( int& accumX, int& accumY )
 #endif
 }
 
+bool CInputSystem::GetTouchAccumulators( InputEventType_t &event, int &fingerId, int& accumX, int& accumY )
+{
+	event = m_touchAccumEvent;
+	fingerId = m_touchAccumFingerId;
+	accumX = m_touchAccumX;
+	accumY = m_touchAccumY;
+
+	return m_bJoystickInitialized;
+}
+
 void CInputSystem::SetConsoleTextMode( bool bConsoleTextMode )
 {
 	/* If someone calls this after init, shut it down. */

inputsystem/inputsystem.h

@@ -44,8 +44,6 @@
 
 #include "steam/steam_api.h"
 
-#define TOUCH_FINGER_MAX_COUNT 10
-
 //-----------------------------------------------------------------------------
 // Implementation of the input system
 //-----------------------------------------------------------------------------
@@ -103,7 +101,7 @@ public:
 	virtual void *GetHapticsInterfaceAddress() const { return NULL;}	
 #endif
 	bool GetRawMouseAccumulators( int& accumX, int& accumY );
-	virtual bool GetTouchAccumulators( int fingerId, float &dx, float &dy );
+	bool GetTouchAccumulators( InputEventType_t &event, int &fingerId, int& accumX, int& accumY );
 
 	virtual void SetConsoleTextMode( bool bConsoleTextMode );
 
@@ -460,7 +458,8 @@ public:
 	bool m_bRawInputSupported;
 	int	 m_mouseRawAccumX, m_mouseRawAccumY;
 
-	float m_touchAccumX[TOUCH_FINGER_MAX_COUNT], m_touchAccumY[TOUCH_FINGER_MAX_COUNT];
+	InputEventType_t m_touchAccumEvent;
+	int m_touchAccumFingerId, m_touchAccumX, m_touchAccumY;
 
 	// For the 'SleepUntilInput' feature
 	HANDLE m_hEvent;

inputsystem/touch_sdl.cpp

@@ -48,9 +48,6 @@ void CInputSystem::InitializeTouch( void )
 	// abort startup if user requests no touch
 	if ( CommandLine()->FindParm("-notouch") ) return;
 
-	memset( m_touchAccumX, 0, sizeof(m_touchAccumX) );
-	memset( m_touchAccumY, 0, sizeof(m_touchAccumY) );
-
 	m_bJoystickInitialized = true;
 	SDL_AddEventWatch(TouchSDLWatcher, this);
 }
@@ -64,35 +61,20 @@ void CInputSystem::ShutdownTouch()
 	m_bTouchInitialized = false;
 }
 
-bool CInputSystem::GetTouchAccumulators( int fingerId, float &dx, float &dy )
-{
-	dx = m_touchAccumX[fingerId];
-	dy = m_touchAccumY[fingerId];
-
-	m_touchAccumX[fingerId] = m_touchAccumY[fingerId] = 0.f;
-
-	return true;
-}
-
 void CInputSystem::FingerEvent(int eventType, int fingerId, float x, float y, float dx, float dy)
 {
-	if( fingerId >= TOUCH_FINGER_MAX_COUNT )
+	// Shit, but should work with arm/x86
-		return;
 
-	if( eventType == IE_FingerUp )
+	int data0 = fingerId << 16 | eventType;
-	{
+	int _x = (int)((double)x*0xFFFF);
-		m_touchAccumX[fingerId] = 0.f;
+	int _y = (int)((double)y*0xFFFF);
-		m_touchAccumY[fingerId] = 0.f;
+	int data1 = _x << 16 | (_y & 0xFFFF);
-	}
-	else
-	{
-		m_touchAccumX[fingerId] += dx;
-		m_touchAccumY[fingerId] += dy;
-	}
 
-	int _x,_y;
+	union{int i;float f;} ifconv;
-	memcpy( &_x, &x, sizeof(float) );
+	ifconv.f = dx;
-	memcpy( &_y, &y, sizeof(float) );
+	int _dx = ifconv.i;
-	PostEvent(eventType, m_nLastSampleTick, fingerId, _x, _y);
+	ifconv.f = dy;
+	int _dy = ifconv.i;
+
+	PostEvent(data0, m_nLastSampleTick, data1, _dx, _dy);
 }
-

ivp

@@ -1 +1 @@
-Subproject commit 47533475e01cbff05fbc3bbe8b4edc485f292cea
+Subproject commit 4098acbbe3bc48320496f7533851640cc40cbb89

materialsystem/CColorCorrection.cpp

@@ -82,12 +82,7 @@ void ColorCorrectionLookup_t::AllocTexture()
 	sprintf( name, "ColorCorrection - %p", m_Handle );
 
 	m_pColorCorrectionTexture = ITextureInternal::CreateProceduralTexture( name, TEXTURE_GROUP_OTHER,
-		COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE,
+		COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, COLOR_CORRECTION_TEXTURE_SIZE, IMAGE_FORMAT_BGRX8888,
-#ifdef DX_TO_GL_ABSTRACTION
-		IMAGE_FORMAT_RGBA8888,
-#else
-		IMAGE_FORMAT_BGRX8888,
-#endif
 		TEXTUREFLAGS_NOMIP | TEXTUREFLAGS_NOLOD | TEXTUREFLAGS_SINGLECOPY | TEXTUREFLAGS_CLAMPS | 
 		TEXTUREFLAGS_CLAMPT | TEXTUREFLAGS_CLAMPU | TEXTUREFLAGS_NODEBUGOVERRIDE );
 

public/cdll_int.h

@@ -790,7 +790,7 @@ public:
 
 	virtual bool IsConnectedUserInfoChangeAllowed( IConVar *pCvar ) = 0;
 
-	virtual void IN_TouchEvent( int type, int fingerId, int x, int y ) = 0;
+	virtual void IN_TouchEvent( uint data, uint data2, uint data3, uint data4 ) = 0;
 };
 
 #define CLIENT_DLL_INTERFACE_VERSION		"VClient017"

public/inputsystem/iinputsystem.h

@@ -119,7 +119,6 @@ public:
 
 	// read and clear accumulated raw input values
 	virtual bool GetRawMouseAccumulators( int& accumX, int& accumY ) = 0;
-	virtual bool GetTouchAccumulators( int fingerId, float &dx, float &dy ) = 0;
 
 	// tell the input system that we're not a game, we're console text mode.
 	// this is used for dedicated servers to not initialize joystick system.

public/mathlib/ssemath.h

@@ -1787,14 +1787,14 @@ FORCEINLINE fltx4 LoadAlignedSIMD( const VectorAligned & pSIMD )
 	return SetWToZeroSIMD( LoadAlignedSIMD(pSIMD.Base()) );
 }
 
-#ifdef USING_ASAN
+#ifdef __SANITIZE_ADDRESS__
-static NO_ASAN fltx4 LoadUnalignedSIMD( const void *pSIMD )
+static __attribute__((no_sanitize("address"))) fltx4 LoadUnalignedSIMD( const void *pSIMD )
 {
 	return _mm_loadu_ps( reinterpret_cast<const float *>( pSIMD ) );
 
 }
 
-static NO_ASAN fltx4 LoadUnaligned3SIMD( const void *pSIMD )
+static __attribute__((no_sanitize("address"))) fltx4 LoadUnaligned3SIMD( const void *pSIMD )
 {
 	return _mm_loadu_ps( reinterpret_cast<const float *>( pSIMD ) );
 }

public/sentence.cpp

@@ -345,6 +345,10 @@ unsigned int CPhonemeTag::ComputeDataCheckSum()
 //-----------------------------------------------------------------------------
 // Purpose: Simple language to string and string to language lookup dictionary
 //-----------------------------------------------------------------------------
+#if defined(__i386__) || defined(__x86_64__)
+#pragma pack(1)
+#endif
+
 struct CCLanguage
 {
 	int				type;
@@ -367,6 +371,9 @@ static CCLanguage g_CCLanguageLookup[] =
 	{ CC_THAI,		"thai",			0 ,		150,	250 },
 	{ CC_PORTUGUESE,"portuguese",	0 ,		0,		150 },	
 };
+#if defined(__i386__) || defined(__x86_64__)
+#pragma pack()
+#endif
 
 void CSentence::ColorForLanguage( int language, unsigned char& r, unsigned char& g, unsigned char& b )
 {
@@ -1760,4 +1767,4 @@ void CSentence::CreateEventWordDistribution( char const *pszText, float flSenten
 }
 
 
-#endif // !_STATIC_LINKED || _SHARED_LIB
+#endif // !_STATIC_LINKED || _SHARED_LIB

public/soundflags.h

@@ -95,7 +95,6 @@ enum soundlevel_t
 
 	// NOTE: Valid soundlevel_t values are 0-255.
 	//       256-511 are reserved for sounds using goldsrc compatibility attenuation.
-	SNDLVBL_MAX		= 511
 };
 
 #define MAX_SNDLVL_BITS		9	// Used to encode 0-255 for regular soundlevel_t's and 256-511 for goldsrc-compatible ones.

public/tier0/platform.h

@@ -594,7 +594,7 @@ typedef void * HINSTANCE;
 	#define FMTFUNCTION( a, b )
 #elif defined(GNUC)
 	#define SELECTANY __attribute__((weak))
-	#ifndef DEDICATED
+	#if defined(LINUX) && !defined(DEDICATED)
 		#define RESTRICT
 	#else
 		#define RESTRICT __restrict

public/togl/linuxwin/glmdebug.h

@@ -25,7 +25,9 @@
 #define	GLMDEBUG_H
 
 #include "tier0/platform.h"
+#if defined( OSX )
 #include <stdarg.h>
+#endif
 
 // include this anywhere you need to be able to compile-out code related specifically to GLM debugging.
 

public/togles/linuxwin/glmdebug.h

@@ -25,7 +25,9 @@
 #define	GLMDEBUG_H
 
 #include "tier0/platform.h"
+#if defined( OSX )
 #include <stdarg.h>
+#endif
 
 // include this anywhere you need to be able to compile-out code related specifically to GLM debugging.
 

public/vtf/vtf.h

@@ -455,9 +455,7 @@ bool GetVTFPreload360Data( const char *pDebugName, CUtlBuffer &fileBufferIn, CUt
 // compiler pads, the 360 compiler does NOT.
 //-----------------------------------------------------------------------------
 
-// nillerusr: try to avoid problems with pragma pack, remove c++ inheritance to make this structs platform-independent
+struct VTFFileBaseHeader_t
-
-struct alignas(16) VTFFileBaseHeader_t
 {
 	DECLARE_BYTESWAP_DATADESC();
 	char fileTypeString[4]; // "VTF" Valve texture file
@@ -465,23 +463,22 @@ struct alignas(16) VTFFileBaseHeader_t
 	int headerSize;
 };
 
-struct alignas(16) VTFFileHeaderV7_1_t
+struct VTFFileHeaderV7_1_t : public VTFFileBaseHeader_t 
 {
 	DECLARE_BYTESWAP_DATADESC();
-	char fileTypeString[4]; // "VTF" Valve texture file
-	int version[2]; 		// version[0].version[1]
-	int headerSize;
-
 	unsigned short	width;
 	unsigned short	height;
 	unsigned int	flags;
 	unsigned short	numFrames;
 	unsigned short	startFrame;
-
+#if !defined( POSIX ) && !defined( _X360 )
-	// must manually align in order to maintain pack(1) expected layout with existing binaries
-	char pad1[4];
 	VectorAligned	reflectivity;
-
+#else
+	// must manually align in order to maintain pack(1) expected layout with existing binaries
+	char			pad1[4];
+	Vector			reflectivity;
+	char			pad2[4];
+#endif
 	float			bumpScale;
 	ImageFormat		imageFormat;
 	unsigned char	numMipLevels;
@@ -490,65 +487,13 @@ struct alignas(16) VTFFileHeaderV7_1_t
 	unsigned char	lowResImageHeight;	
 };
 
-struct alignas(16) VTFFileHeaderV7_2_t
+struct VTFFileHeaderV7_2_t : public VTFFileHeaderV7_1_t
 {
 	DECLARE_BYTESWAP_DATADESC();
 
-	char fileTypeString[4]; // "VTF" Valve texture file
-	int version[2]; 		// version[0].version[1]
-	int headerSize;
-
-	unsigned short	width;
-	unsigned short	height;
-	unsigned int	flags;
-	unsigned short	numFrames;
-	unsigned short	startFrame;
-
-	// must manually align in order to maintain pack(1) expected layout with existing binaries
-	char pad1[4];
-	VectorAligned	reflectivity;
-
-	float			bumpScale;
-	ImageFormat		imageFormat;
-	unsigned char	numMipLevels;
-	ImageFormat		lowResImageFormat;
-	unsigned char	lowResImageWidth;
-	unsigned char	lowResImageHeight;	
 	unsigned short depth;
 };
 
-struct alignas(16) VTFFileHeaderV7_3_t
-{
-	DECLARE_BYTESWAP_DATADESC();
-
-	char fileTypeString[4]; // "VTF" Valve texture file
-	int version[2]; 		// version[0].version[1]
-	int headerSize;
-
-	unsigned short	width;
-	unsigned short	height;
-	unsigned int	flags;
-	unsigned short	numFrames;
-	unsigned short	startFrame;
-
-	// must manually align in order to maintain pack(1) expected layout with existing binaries
-	char pad1[4];
-	VectorAligned	reflectivity;
-
-	float			bumpScale;
-	ImageFormat		imageFormat;
-	unsigned char	numMipLevels;
-	ImageFormat		lowResImageFormat;
-	unsigned char	lowResImageWidth;
-	unsigned char	lowResImageHeight;	
-	unsigned short depth;
-
-	char			pad4[3];
-	unsigned int	numResources;
-};
-
-typedef VTFFileHeaderV7_3_t VTFFileHeader_t;
-
 #define BYTE_POS( byteVal, shft )	uint32( uint32(uint8(byteVal)) << uint8(shft * 8) )
 #if !defined( _X360 )
 #define MK_VTF_RSRC_ID(a, b, c)		uint32( BYTE_POS(a, 0) | BYTE_POS(b, 1) | BYTE_POS(c, 2) )
@@ -593,6 +538,28 @@ struct ResourceEntryInfo
 	unsigned int		resData;	// Resource data or offset from the beginning of the file
 };
 
+struct VTFFileHeaderV7_3_t : public VTFFileHeaderV7_2_t
+{
+	DECLARE_BYTESWAP_DATADESC();
+
+	char			pad4[3];
+	unsigned int	numResources;
+
+#if defined( _X360 ) || defined( POSIX )
+	// must manually align in order to maintain pack(1) expected layout with existing binaries
+	char			pad5[8];
+#endif
+	
+	// AFTER THE IMPLICIT PADDING CAUSED BY THE COMPILER....
+	// *** followed by *** ResourceEntryInfo resources[0];
+	// Array of resource entry infos sorted ascending by type
+};
+
+struct VTFFileHeader_t : public VTFFileHeaderV7_3_t
+{
+	DECLARE_BYTESWAP_DATADESC();
+};
+
 #define VTF_X360_MAJOR_VERSION	0x0360
 #define VTF_X360_MINOR_VERSION	8
 struct VTFFileHeaderX360_t : public VTFFileBaseHeader_t 

scripts/build-macos-amd64.sh

@@ -4,5 +4,5 @@ git submodule init && git submodule update
 
 brew install sdl2
 
-./waf configure -T debug --disable-warns $* &&
+./waf configure -T debug --64bits --disable-warns $* &&
 ./waf build

scripts/build-ubuntu-amd64.sh

@@ -4,5 +4,5 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -f -y libopenal-dev g++-multilib gcc-multilib libpng-dev libjpeg-dev libfreetype6-dev libfontconfig1-dev libcurl4-gnutls-dev libsdl2-dev zlib1g-dev libbz2-dev libedit-dev
 
-./waf configure -T debug --disable-warns $* &&
+./waf configure -T debug --64bits --disable-warns $* &&
 ./waf build

scripts/build-ubuntu-i386.sh

@@ -6,5 +6,5 @@ sudo apt-get update
 sudo apt-get install -y aptitude
 sudo aptitude install -y libopenal-dev:i386 g++-multilib gcc-multilib libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 libfontconfig1-dev:i386 libcurl4-gnutls-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386 libbz2-dev:i386 libedit-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns --32bits $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T debug --disable-warns $* &&
 ./waf build

scripts/tests-macos-amd64.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 git submodule init && git submodule update
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
+./waf configure -T release --sanitize=address,undefined --disable-warns --tests -8 --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 DYLD_LIBRARY_PATH=bin/ ./unittest || exit 1

scripts/tests-ubuntu-amd64.sh

@@ -4,7 +4,7 @@ git submodule init && git submodule update
 sudo apt-get update
 sudo apt-get install -y libbz2-dev
 
-./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
+./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ --64bits $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest

scripts/tests-ubuntu-i386.sh

@@ -5,7 +5,7 @@ sudo dpkg --add-architecture i386
 sudo apt-get update
 sudo apt-get install -y g++-multilib gcc-multilib libbz2-dev:i386
 
-PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --32bits --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
+PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig ./waf configure -T release --sanitize=address,undefined --disable-warns --tests --prefix=out/ $* &&
 ./waf install &&
 cd out &&
 LD_LIBRARY_PATH=bin/ ./unittest

togl/linuxwin/dx9asmtogl2.cpp

@@ -1010,7 +1010,7 @@ CUtlString D3DToGL::FixGLSLSwizzle( const char *pDestRegisterName, const char *p
 {
 	bool bAbsWrapper = false; // Parameter wrapped in an abs()
 	bool bAbsNegative = false; // -abs()
-	static char szSrcRegister[128];
+	char szSrcRegister[128];
 	V_strncpy( szSrcRegister, pSrcRegisterName, sizeof(szSrcRegister) );
 
 	// Check for abs() or -abs() wrapper and strip it off during the fixup

vgui2/src/system_posix.cpp

@@ -32,7 +32,6 @@
 #include <sys/param.h>
 #include <sys/mount.h>
 #elif defined(LINUX)
-#define _LARGEFILE64_SOURCE
 #include <sys/vfs.h>
 #endif
 #ifdef OSX

vgui2/vgui_controls/FileOpenDialog.cpp

@@ -1500,9 +1500,6 @@ void FileOpenDialog::OnOpen()
 	char pFileName[MAX_PATH];
 	GetSelectedFileName( pFileName, sizeof( pFileName ) );
 
-	if( !pFileName[0] )
-		return;
-
 	int nLen = Q_strlen( pFileName );
 	bool bSpecifiedDirectory = ( pFileName[nLen-1] == '/' || pFileName[nLen-1] == '\\' ) && (!IsOSX() || ( IsOSX() && !Q_stristr( pFileName, ".app" ) ) );
 	Q_StripTrailingSlash( pFileName );

vguimatsurface/Input.cpp

@@ -376,7 +376,7 @@ static vgui::MouseCode ButtonCodeToMouseCode( ButtonCode_t buttonCode )
 //-----------------------------------------------------------------------------
 bool InputHandleInputEvent( const InputEvent_t &event )
 {
-	switch( event.m_nType )
+	switch( event.m_nType & 0xFFFF )
 	{
 	case IE_ButtonPressed:
 		{
@@ -428,10 +428,9 @@ bool InputHandleInputEvent( const InputEvent_t &event )
 	case IE_FingerDown:
 		{
 			int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
-			float _x, _y;
+			uint data = (uint)event.m_nData;
-			memcpy( &_x, &event.m_nData2, sizeof(_x) );
+			x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF);
-			memcpy( &_y, &event.m_nData3, sizeof(_y) );
+			y = h*((double)(data & 0xFFFF) / 0xFFFF);
-			x = w*_x; y = h*_y;
 			g_pIInput->UpdateCursorPosInternal( x, y );
 			g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_PRESSED );
 			g_pIInput->InternalMousePressed( MOUSE_LEFT );
@@ -440,10 +439,9 @@ bool InputHandleInputEvent( const InputEvent_t &event )
 	case IE_FingerUp:
 		{
 			int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
-			float _x, _y;
+			uint data = (uint)event.m_nData;
-			memcpy( &_x, &event.m_nData2, sizeof(_x) );
+			x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF);
-			memcpy( &_y, &event.m_nData3, sizeof(_y) );
+			y = h*((double)(data & 0xFFFF) / 0xFFFF);
-			x = w*_x; y = h*_y;
 			g_pIInput->UpdateCursorPosInternal( x, y );
 			g_pIInput->SetMouseCodeState( MOUSE_LEFT, vgui::BUTTON_RELEASED );
 			g_pIInput->InternalMouseReleased( MOUSE_LEFT );
@@ -452,10 +450,9 @@ bool InputHandleInputEvent( const InputEvent_t &event )
 	case IE_FingerMotion:
 		{
 			int w,h,x,y; g_MatSystemSurface.GetScreenSize(w, h);
-			float _x, _y;
+			uint data = (uint)event.m_nData;
-			memcpy( &_x, &event.m_nData2, sizeof(_x) );
+			x = w*((double)((data >> 16) & 0xFFFF) / 0xFFFF);
-			memcpy( &_y, &event.m_nData3, sizeof(_y) );
+			y = h*((double)(data & 0xFFFF) / 0xFFFF);
-			x = w*_x; y = h*_y;
 			g_pIInput->InternalCursorMoved( x, y );
 		}
 		return true;

vtf/vtf.cpp

@@ -27,10 +27,7 @@ BEGIN_BYTESWAP_DATADESC( VTFFileBaseHeader_t )
 	DEFINE_FIELD( headerSize, FIELD_INTEGER ),
 END_DATADESC()
 
-BEGIN_BYTESWAP_DATADESC( VTFFileHeaderV7_1_t )
+BEGIN_BYTESWAP_DATADESC_( VTFFileHeaderV7_1_t, VTFFileBaseHeader_t )
-	DEFINE_ARRAY( fileTypeString, FIELD_CHARACTER, 4 ),
-	DEFINE_ARRAY( version, FIELD_INTEGER, 2 ),
-	DEFINE_FIELD( headerSize, FIELD_INTEGER ),
 	DEFINE_FIELD( width, FIELD_SHORT ),
 	DEFINE_FIELD( height, FIELD_SHORT ),
 	DEFINE_FIELD( flags, FIELD_INTEGER ),
@@ -45,45 +42,17 @@ BEGIN_BYTESWAP_DATADESC( VTFFileHeaderV7_1_t )
 	DEFINE_FIELD( lowResImageHeight, FIELD_CHARACTER ),
 END_DATADESC()
 
-BEGIN_BYTESWAP_DATADESC( VTFFileHeaderV7_2_t )
+BEGIN_BYTESWAP_DATADESC_( VTFFileHeaderV7_2_t, VTFFileHeaderV7_1_t )
-	DEFINE_ARRAY( fileTypeString, FIELD_CHARACTER, 4 ),
-	DEFINE_ARRAY( version, FIELD_INTEGER, 2 ),
-	DEFINE_FIELD( headerSize, FIELD_INTEGER ),
-	DEFINE_FIELD( width, FIELD_SHORT ),
-	DEFINE_FIELD( height, FIELD_SHORT ),
-	DEFINE_FIELD( flags, FIELD_INTEGER ),
-	DEFINE_FIELD( numFrames, FIELD_SHORT ),
-	DEFINE_FIELD( startFrame, FIELD_SHORT ),
-	DEFINE_FIELD( reflectivity, FIELD_VECTOR ),
-	DEFINE_FIELD( bumpScale, FIELD_FLOAT ),
-	DEFINE_FIELD( imageFormat, FIELD_INTEGER ),
-	DEFINE_FIELD( numMipLevels, FIELD_CHARACTER ),
-	DEFINE_FIELD( lowResImageFormat, FIELD_INTEGER ),
-	DEFINE_FIELD( lowResImageWidth, FIELD_CHARACTER ),
-	DEFINE_FIELD( lowResImageHeight, FIELD_CHARACTER ),
 	DEFINE_FIELD( depth, FIELD_SHORT ),
 END_DATADESC()
 
-BEGIN_BYTESWAP_DATADESC( VTFFileHeaderV7_3_t )
+BEGIN_BYTESWAP_DATADESC_( VTFFileHeaderV7_3_t, VTFFileHeaderV7_2_t )
-	DEFINE_ARRAY( fileTypeString, FIELD_CHARACTER, 4 ),
-	DEFINE_ARRAY( version, FIELD_INTEGER, 2 ),
-	DEFINE_FIELD( headerSize, FIELD_INTEGER ),
-	DEFINE_FIELD( width, FIELD_SHORT ),
-	DEFINE_FIELD( height, FIELD_SHORT ),
-	DEFINE_FIELD( flags, FIELD_INTEGER ),
-	DEFINE_FIELD( numFrames, FIELD_SHORT ),
-	DEFINE_FIELD( startFrame, FIELD_SHORT ),
-	DEFINE_FIELD( reflectivity, FIELD_VECTOR ),
-	DEFINE_FIELD( bumpScale, FIELD_FLOAT ),
-	DEFINE_FIELD( imageFormat, FIELD_INTEGER ),
-	DEFINE_FIELD( numMipLevels, FIELD_CHARACTER ),
-	DEFINE_FIELD( lowResImageFormat, FIELD_INTEGER ),
-	DEFINE_FIELD( lowResImageWidth, FIELD_CHARACTER ),
-	DEFINE_FIELD( lowResImageHeight, FIELD_CHARACTER ),
-	DEFINE_FIELD( depth, FIELD_SHORT ),
 	DEFINE_FIELD( numResources, FIELD_INTEGER ),
 END_DATADESC()
 
+BEGIN_BYTESWAP_DATADESC_( VTFFileHeader_t, VTFFileHeaderV7_2_t )
+END_DATADESC()
+
 BEGIN_BYTESWAP_DATADESC_( VTFFileHeaderX360_t, VTFFileBaseHeader_t )
 	DEFINE_FIELD( flags, FIELD_INTEGER ),
 	DEFINE_FIELD( width, FIELD_SHORT ),
@@ -934,11 +903,23 @@ static bool ReadHeaderFromBufferPastBaseHeader( CUtlBuffer &buf, VTFFileHeader_t
 	else if ( header.version[1] == 2 )
 	{
 		buf.Get( pBuf, sizeof(VTFFileHeaderV7_2_t) - sizeof(VTFFileBaseHeader_t) );
+
+		#if defined( _X360 ) || defined (POSIX)
+			// read 15 dummy bytes to be properly positioned with 7.2 PC data
+			byte dummy[15];
+			buf.Get( dummy, 15 );
+		#endif
 	}
 	else if ( header.version[1] == 1 || header.version[1] == 0 )
 	{
 		// previous version 7.0 or 7.1
 		buf.Get( pBuf, sizeof(VTFFileHeaderV7_1_t) - sizeof(VTFFileBaseHeader_t) );
+
+		#if defined( _X360 ) || defined (POSIX)
+			// read a dummy byte to be properly positioned with 7.0/1 PC data
+			byte dummy;
+			buf.Get( &dummy, 1 );
+		#endif
 	}
 	else
 	{

wscript

@@ -26,21 +26,6 @@ FC_CHECK='''extern "C" {
 int main() { return (int)FcInit(); }
 '''
 
-CPP_64BIT_CHECK='''
-#define TEST(a) (sizeof(void*) == a ? 1 : -1) 
-int g_Test[TEST(8)];
-
-int main () { return 0; }
-'''
-
-CPP_32BIT_CHECK='''
-#define TEST(a) (sizeof(void*) == a ? 1 : -1) 
-int g_Test[TEST(4)];
-
-int main () { return 0; }
-'''
-
-
 Context.Context.line_just = 55 # should fit for everything on 80x26
 
 projects={
@@ -140,7 +125,6 @@ projects={
 		'tier1',
 		'tier2',
 		'tier3',
-		'vgui2/vgui_controls',
 		'vphysics',
 		'vpklib',
 		'vstdlib',
@@ -171,11 +155,6 @@ def get_taskgen_count(self):
 	except: idx = 0 # don't set tg_idx_count to not increase counter
 	return idx
 
-@Configure.conf
-def run_test(self, fragment, msg):
-	result = self.check_cxx(fragment=fragment, msg=msg, mandatory = False)
-	return False if result == None else True
-
 def define_platform(conf):
 	conf.env.DEDICATED = conf.options.DEDICATED
 	conf.env.TESTS = conf.options.TESTS
@@ -183,12 +162,6 @@ def define_platform(conf):
 	conf.env.GL = conf.options.GL and not conf.options.TESTS and not conf.options.DEDICATED
 	conf.env.OPUS = conf.options.OPUS
 
-	arch32 = conf.run_test(CPP_32BIT_CHECK, 'Testing 32bit support')
-	arch64 = conf.run_test(CPP_64BIT_CHECK, 'Testing 64bit support')
-
-	if not (arch32 ^ arch64):
-		conf.fatal('Your compiler sucks')
-
 	if conf.options.DEDICATED:
 		conf.options.SDL = False
 		conf.define('DEDICATED', 1)
@@ -213,7 +186,7 @@ def define_platform(conf):
 		conf.env.SDL = 1
 		conf.define('USE_SDL', 1)
 
-	if arch64:
+	if conf.options.ALLOW64:
 		conf.define('PLATFORM_64BITS', 1)
 
 	if conf.env.DEST_OS == 'linux':
@@ -266,10 +239,6 @@ def define_platform(conf):
 			'_DLL_EXT=.so'
 		])
 
-	if conf.env.DEST_OS != 'win32':
-		conf.define('NO_MEMOVERRIDE_NEW_DELETE', 1)
-#		conf.define('NO_MALLOC_OVERRIDE', 1)
-
 	if conf.options.DEBUG_ENGINE:
 		conf.env.append_unique('DEFINES', [
 			'DEBUG', '_DEBUG'
@@ -279,14 +248,11 @@ def define_platform(conf):
 			'NDEBUG'
 		])
 
-	conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)
-
-
 def options(opt):
 	grp = opt.add_option_group('Common options')
 
-	grp.add_option('-4', '--32bits', action = 'store_true', dest = 'TARGET32', default = False,
+	grp.add_option('-8', '--64bits', action = 'store_true', dest = 'ALLOW64', default = False,
-		help = 'allow targetting 32-bit engine(Linux/Windows/OSX x86 only) [default: %default]')
+		help = 'allow targetting 64-bit engine(Linux/Windows/OSX x86 only) [default: %default]')
 
 	grp.add_option('-d', '--dedicated', action = 'store_true', dest = 'DEDICATED', default = False,
 		help = 'build dedicated server [default: %default]')
@@ -332,7 +298,7 @@ def options(opt):
 def check_deps(conf):
 	if conf.env.DEST_OS != 'win32':
 		conf.check_cc(lib='dl', mandatory=False)
-		conf.check_cc(lib='bz2', mandatory=True)
+		conf.check_cc(lib='bz2', mandatory=False)
 		conf.check_cc(lib='rt', mandatory=False)
 
 		if not conf.env.LIB_M: # HACK: already added in xcompile!
@@ -440,24 +406,19 @@ def configure(conf):
 	# subsystem=bld.env.MSVC_SUBSYSTEM
 	# TODO: wrapper around bld.stlib, bld.shlib and so on?
 	conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01'
-	conf.env.MSVC_TARGETS = ['x64'] # explicitly request x86 target for MSVC
+	conf.env.MSVC_TARGETS = ['x86'] # explicitly request x86 target for MSVC
-	if conf.options.TARGET32:
+	if conf.options.ALLOW64:
-		conf.env.MSVC_TARGETS = ['x86']
+		conf.env.MSVC_TARGETS = ['x64']
-
 	if sys.platform == 'win32':
-		conf.load('msvc_pdb_ext msdev msvs msvcdeps')
+		conf.load('msvc_pdb_ext msdev msvs')
-	conf.load('subproject xcompile compiler_c compiler_cxx gccdeps gitversion clang_compilation_database strip_on_install_v2 waf_unit_test enforce_pic')
+	conf.load('subproject xcompile compiler_c compiler_cxx gitversion clang_compilation_database strip_on_install_v2 waf_unit_test enforce_pic')
 	if conf.env.DEST_OS == 'win32' and conf.env.DEST_CPU == 'amd64':
 		conf.load('masm')
 	elif conf.env.DEST_OS == 'darwin':
 		conf.load('mm_hook')
 
-	conf.env.BIT32_MANDATORY = conf.options.TARGET32
-	if conf.env.BIT32_MANDATORY:
-		Logs.info('WARNING: will build engine for 32-bit target')
-		conf.load('force_32bit')
-
 	define_platform(conf)
+	conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)
 
 	if conf.env.TOGLES:
 		projects['game'] += ['togles']
@@ -470,6 +431,11 @@ def configure(conf):
 	if conf.options.OPUS or conf.env.DEST_OS == 'android':
 		projects['game'] += ['engine/voice_codecs/opus']
 
+	conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
+	if conf.env.BIT32_MANDATORY:
+		Logs.info('WARNING: will build engine for 32-bit target')
+		conf.load('force_32bit')
+
 	if conf.options.DISABLE_WARNS:
 		compiler_optional_flags = ['-w']
 	else:
@@ -527,7 +493,7 @@ def configure(conf):
 		flags += ['-fsigned-char']
 
 	if conf.env.DEST_CPU == 'arm':
-		flags += ['-march=armv7-a', '-mfpu=neon-vfpv4']
+		flags += ['-mfpu=neon-vfpv4']
 
 	if conf.env.DEST_OS == 'freebsd':
 		linkflags += ['-lexecinfo']
@@ -551,11 +517,11 @@ def configure(conf):
 
 		if conf.options.BUILD_TYPE == 'debug':
 			linkflags += [
-				'/FORCE:MULTIPLE',
 				'/INCREMENTAL:NO',
 				'/NODEFAULTLIB:libc',
 				'/NODEFAULTLIB:libcd',
 				'/NODEFAULTLIB:libcmt',
+				'/FORCE',
 				'/LARGEADDRESSAWARE'
 			]
 		else: