about summary refs log tree commit diff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/client/sound.cpp60
-rw-r--r--src/engine/docs/client_time.txt2
-rw-r--r--src/engine/docs/prediction.txt2
-rw-r--r--src/engine/docs/server_op.txt4
-rw-r--r--src/engine/docs/snapshots.txt2
-rw-r--r--src/engine/server/server.cpp2
-rw-r--r--src/engine/serverbrowser.h2
-rw-r--r--src/engine/shared/console.cpp8
-rw-r--r--src/engine/shared/demo.cpp2
-rw-r--r--src/engine/shared/masterserver.cpp2
-rw-r--r--src/engine/shared/network_console.cpp6
-rw-r--r--src/engine/shared/network_console_conn.cpp2
-rw-r--r--src/engine/sound.h4
13 files changed, 49 insertions, 49 deletions
diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
index aae52e32..45404d18 100644
--- a/src/engine/client/sound.cpp
+++ b/src/engine/client/sound.cpp
@@ -19,7 +19,7 @@ enum
 	NUM_SAMPLES = 512,
 	NUM_VOICES = 64,
 	NUM_CHANNELS = 16,
-	
+
 	MAX_FRAMES = 1024
 };
 
@@ -89,9 +89,9 @@ static void Mix(short *pFinalOut, unsigned Frames)
 
 	// aquire lock while we are mixing
 	lock_wait(m_SoundLock);
-	
+
 	MasterVol = m_SoundVolume;
-	
+
 	for(unsigned i = 0; i < NUM_VOICES; i++)
 	{
 		if(m_aVoices[i].m_pSample)
@@ -103,7 +103,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
 			int Step = v->m_pSample->m_Channels; // setup input sources
 			short *pInL = &v->m_pSample->m_pData[v->m_Tick*Step];
 			short *pInR = &v->m_pSample->m_pData[v->m_Tick*Step+1];
-			
+
 			unsigned End = v->m_pSample->m_NumFrames-v->m_Tick;
 
 			int Rvol = v->m_pChannel->m_Vol;
@@ -112,7 +112,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
 			// make sure that we don't go outside the sound data
 			if(Frames < End)
 				End = Frames;
-			
+
 			// check if we have a mono sound
 			if(v->m_pSample->m_Channels == 1)
 				pInR = pInL;
@@ -133,7 +133,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
 						Lvol = ((Range-p)*Lvol)/Range;
 					else
 						Rvol = ((Range-p)*Rvol)/Range;
-					
+
 					// falloff
 					Lvol = (Lvol*(Range-Dist))/Range;
 					Rvol = (Rvol*(Range-Dist))/Range;
@@ -154,7 +154,7 @@ static void Mix(short *pFinalOut, unsigned Frames)
 				pInR += Step;
 				v->m_Tick++;
 			}
-			
+
 			// free voice if not used any more
 			if(v->m_Tick == v->m_pSample->m_NumFrames)
 			{
@@ -165,8 +165,8 @@ static void Mix(short *pFinalOut, unsigned Frames)
 			}
 		}
 	}
-	
-	
+
+
 	// release the lock
 	lock_release(m_SoundLock);
 
@@ -201,14 +201,14 @@ int CSound::Init()
 	m_SoundEnabled = 0;
 	m_pGraphics = Kernel()->RequestInterface<IEngineGraphics>();
 	m_pStorage = Kernel()->RequestInterface<IStorage>();
-	
+
 	SDL_AudioSpec Format;
-	
+
 	m_SoundLock = lock_create();
-	
+
 	if(!g_Config.m_SndEnable)
 		return 0;
-	
+
 	m_MixingRate = g_Config.m_SndRate;
 
 	// Set 16-bit stereo audio at 22Khz
@@ -229,7 +229,7 @@ int CSound::Init()
 		dbg_msg("client/sound", "sound init successful");
 
 	SDL_PauseAudio(0);
-	
+
 	m_SoundEnabled = 1;
 	Update(); // update the volume
 	return 0;
@@ -239,17 +239,17 @@ int CSound::Update()
 {
 	// update volume
 	int WantedVolume = g_Config.m_SndVolume;
-	
+
 	if(!m_pGraphics->WindowActive() && g_Config.m_SndNonactiveMute)
 		WantedVolume = 0;
-	
+
 	if(WantedVolume != m_SoundVolume)
 	{
 		lock_wait(m_SoundLock);
 		m_SoundVolume = WantedVolume;
 		lock_release(m_SoundLock);
 	}
-	
+
 	return 0;
 }
 
@@ -277,7 +277,7 @@ void CSound::RateConvert(int SampleID)
 	CSample *pSample = &m_aSamples[SampleID];
 	int NumFrames = 0;
 	short *pNewData = 0;
-	
+
 	// make sure that we need to convert this sound
 	if(!pSample->m_pData || pSample->m_Rate == m_MixingRate)
 		return;
@@ -285,7 +285,7 @@ void CSound::RateConvert(int SampleID)
 	// allocate new data
 	NumFrames = (int)((pSample->m_NumFrames/(float)pSample->m_Rate)*m_MixingRate);
 	pNewData = (short *)mem_alloc(NumFrames*pSample->m_Channels*sizeof(short), 1);
-	
+
 	for(int i = 0; i < NumFrames; i++)
 	{
 		// resample TODO: this should be done better, like linear atleast
@@ -293,7 +293,7 @@ void CSound::RateConvert(int SampleID)
 		int f = (int)(a*pSample->m_NumFrames);
 		if(f >= pSample->m_NumFrames)
 			f = pSample->m_NumFrames-1;
-		
+
 		// set new data
 		if(pSample->m_Channels == 1)
 			pNewData[i] = pSample->m_pData[f];
@@ -303,7 +303,7 @@ void CSound::RateConvert(int SampleID)
 			pNewData[i*2+1] = pSample->m_pData[f*2+1];
 		}
 	}
-	
+
 	// free old data and apply new
 	mem_free(pSample->m_pData);
 	pSample->m_pData = pNewData;
@@ -321,15 +321,15 @@ int CSound::LoadWV(const char *pFilename)
 	int SampleID = -1;
 	char aError[100];
 	WavpackContext *pContext;
-	
+
 	// don't waste memory on sound when we are stress testing
 	if(g_Config.m_DbgStress)
 		return -1;
-		
+
 	// no need to load sound when we are running with no sound
 	if(!m_SoundEnabled)
 		return 1;
-		
+
 	if(!m_pStorage)
 		return -1;
 
@@ -372,7 +372,7 @@ int CSound::LoadWV(const char *pFilename)
 			dbg_msg("sound/wv", "file is %d Hz, not 44100 Hz. filename='%s'", snd->rate, filename);
 			return -1;
 		}*/
-		
+
 		if(BitsPerSample != 16)
 		{
 			dbg_msg("sound/wv", "bps is %d, not 16, filname='%s'", BitsPerSample, pFilename);
@@ -382,7 +382,7 @@ int CSound::LoadWV(const char *pFilename)
 		pData = (int *)mem_alloc(4*m_aSamples*m_aChannels, 1);
 		WavpackUnpackSamples(pContext, pData, m_aSamples); // TODO: check return value
 		pSrc = pData;
-		
+
 		pSample->m_pData = (short *)mem_alloc(2*m_aSamples*m_aChannels, 1);
 		pDst = pSample->m_pData;
 
@@ -428,9 +428,9 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
 {
 	int VoiceID = -1;
 	int i;
-	
+
 	lock_wait(m_SoundLock);
-	
+
 	// search for voice
 	for(i = 0; i < NUM_VOICES; i++)
 	{
@@ -442,7 +442,7 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
 			break;
 		}
 	}
-	
+
 	// voice found, use it
 	if(VoiceID != -1)
 	{
@@ -457,7 +457,7 @@ int CSound::Play(int ChannelID, int SampleID, int Flags, float x, float y)
 		m_aVoices[VoiceID].m_X = (int)x;
 		m_aVoices[VoiceID].m_Y = (int)y;
 	}
-	
+
 	lock_release(m_SoundLock);
 	return VoiceID;
 }
diff --git a/src/engine/docs/client_time.txt b/src/engine/docs/client_time.txt
index bc76f91c..0d4dd53e 100644
--- a/src/engine/docs/client_time.txt
+++ b/src/engine/docs/client_time.txt
@@ -6,6 +6,6 @@ predtick, predintratick
  prevtick              tick                 predtick
    4                     8                    14
    |---------------------|---------------------|
-   0 <- intratick    ->  1                     
+   0 <- intratick    ->  1
    0 <- ticktime(in s)-> X
                          0 <- predintratick?-> 1
diff --git a/src/engine/docs/prediction.txt b/src/engine/docs/prediction.txt
index d5771d1a..e740b1e8 100644
--- a/src/engine/docs/prediction.txt
+++ b/src/engine/docs/prediction.txt
@@ -8,7 +8,7 @@ Predicted input sent to the server can be retrived by calling <client_get_input>
 > {
 > 	int tick;
 > 	prediction_reset();
-> 
+>
 > 	for(tick = client_tick()+1; tick <= client_predtick(); tick++)
 > 	{
 > 		MY_INPUT *input = (MY_INPUT *)client_get_input();
diff --git a/src/engine/docs/server_op.txt b/src/engine/docs/server_op.txt
index 59181e62..c0a054c4 100644
--- a/src/engine/docs/server_op.txt
+++ b/src/engine/docs/server_op.txt
@@ -25,13 +25,13 @@ while running
 			send snapshot
 		end for
 	end
-	
+
 	process new network messages
 end while
 
 unload map
 (end)
-		
+
 
 
 Section: Reinit
diff --git a/src/engine/docs/snapshots.txt b/src/engine/docs/snapshots.txt
index 647b049a..adb84863 100644
--- a/src/engine/docs/snapshots.txt
+++ b/src/engine/docs/snapshots.txt
@@ -48,7 +48,7 @@ After a snapshot have been created, compression is applyed to reduce the bandwid
 
 Topic: Interval
 
-The interval for how often a client recives a snapshot changes during the course of the connection. There are three different snapshot rates. 
+The interval for how often a client recives a snapshot changes during the course of the connection. There are three different snapshot rates.
 
 - *Init*. 5 snapshots per second. Used when a client is connecting and used until the client has acknowlaged a snapshot. This mechanism is used because the first snapshot because no delta compression can be done.
 
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 6f6d9e1c..93e96db9 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -672,7 +672,7 @@ void CServer::SendRconCmdRem(const IConsole::CCommandInfo *pCommandInfo, int Cli
 void CServer::UpdateClientRconCommands()
 {
 	int ClientID = Tick() % MAX_CLIENTS;
-		
+
 	if(m_aClients[ClientID].m_State != CClient::STATE_EMPTY && m_aClients[ClientID].m_Authed)
 	{
 		int ConsoleAccessLevel = m_aClients[ClientID].m_Authed == AUTHED_ADMIN ? IConsole::ACCESS_LEVEL_ADMIN : IConsole::ACCESS_LEVEL_MOD;
diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h
index 1a49eaf0..79919b09 100644
--- a/src/engine/serverbrowser.h
+++ b/src/engine/serverbrowser.h
@@ -24,7 +24,7 @@ public:
 		int m_Country;
 		int m_Score;
 		bool m_Player;
-		
+
 		int m_FriendState;
 	};
 
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index e4cb1991..de5116c1 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -665,7 +665,7 @@ void CConsole::Register(const char *pName, const char *pParams,
 	pCommand->m_pName = pName;
 	pCommand->m_pHelp = pHelp;
 	pCommand->m_pParams = pParams;
-	
+
 	pCommand->m_Flags = Flags;
 	pCommand->m_Temp = false;
 
@@ -699,7 +699,7 @@ void CConsole::RegisterTemp(const char *pName, const char *pParams,	int Flags, c
 	}
 
 	pCommand->m_pfnCallback = 0;
-	pCommand->m_pUserData = 0;	
+	pCommand->m_pUserData = 0;
 	pCommand->m_Flags = Flags;
 	pCommand->m_Temp = true;
 
@@ -729,7 +729,7 @@ void CConsole::DeregisterTemp(const char *pName)
 				break;
 			}
 	}
-	
+
 	// add to recycle list
 	if(pRemoved)
 	{
@@ -742,7 +742,7 @@ void CConsole::DeregisterTempAll()
 {
 	// set non temp as first one
 	for(; m_pFirstCommand && m_pFirstCommand->m_Temp; m_pFirstCommand = m_pFirstCommand->m_pNext);
-	
+
 	// remove temp entries from command list
 	for(CCommand *pCommand = m_pFirstCommand; pCommand && pCommand->m_pNext; pCommand = pCommand->m_pNext)
 	{
diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 51dd51d9..2bd7c28a 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -775,7 +775,7 @@ void CDemoPlayer::GetDemoName(char *pBuffer, int BufferSize) const
 		else if(*pFileName == '.')
 			pEnd = pFileName;
 	}
-	
+
 	int Length = pEnd > pExtractedName ? min(BufferSize, (int)(pEnd-pExtractedName+1)) : BufferSize;
 	str_copy(pBuffer, pExtractedName, Length);
 }
diff --git a/src/engine/shared/masterserver.cpp b/src/engine/shared/masterserver.cpp
index 1271eeaf..eb63bab5 100644
--- a/src/engine/shared/masterserver.cpp
+++ b/src/engine/shared/masterserver.cpp
@@ -157,7 +157,7 @@ public:
 						Added = true;
 						break;
 					}
-				
+
 				if(!Added)
 				{
 					for(int i = 0; i < MAX_MASTERSERVERS; ++i)
diff --git a/src/engine/shared/network_console.cpp b/src/engine/shared/network_console.cpp
index 13ed3751..cfa081a2 100644
--- a/src/engine/shared/network_console.cpp
+++ b/src/engine/shared/network_console.cpp
@@ -56,7 +56,7 @@ int CNetConsole::AcceptClient(NETSOCKET Socket, const NETADDR *pAddr)
 {
 	char aError[256] = { 0 };
 	int FreeSlot = -1;
-	
+
 	// look for free slot or multiple client
 	for(int i = 0; i < NET_MAX_CONSOLE_CLIENTS; i++)
 	{
@@ -115,7 +115,7 @@ int CNetConsole::Update()
 			}
 			else
 				str_format(aBuf, sizeof(aBuf), "You have been banned for life");
-			
+
 			net_tcp_send(Socket, aBuf, str_length(aBuf));
 			net_tcp_close(Socket);
 		}
@@ -170,7 +170,7 @@ bool CNetConsole::AddBan(NETADDR Addr, int Seconds)
 {
 	if(m_NumBans == MAX_BANS)
 		return false;
-	
+
 	Addr.port = 0;
 	int Index = FindBan(Addr);
 	if(Index == -1)
diff --git a/src/engine/shared/network_console_conn.cpp b/src/engine/shared/network_console_conn.cpp
index 75b581fa..9bc163af 100644
--- a/src/engine/shared/network_console_conn.cpp
+++ b/src/engine/shared/network_console_conn.cpp
@@ -181,6 +181,6 @@ int CConsoleNetConnection::Send(const char *pLine)
 		pData += Send;
 		Length -= Send;
 	}
-	
+
 	return 0;
 }
diff --git a/src/engine/sound.h b/src/engine/sound.h
index f55a978d..fa5bfc85 100644
--- a/src/engine/sound.h
+++ b/src/engine/sound.h
@@ -19,10 +19,10 @@ public:
 	virtual bool IsSoundEnabled() = 0;
 
 	virtual int LoadWV(const char *pFilename) = 0;
-	
+
 	virtual void SetChannel(int ChannelID, float Volume, float Panning) = 0;
 	virtual void SetListenerPos(float x, float y) = 0;
-	
+
 	virtual int PlayAt(int ChannelID, int SampleID, int Flags, float x, float y) = 0;
 	virtual int Play(int ChannelID, int SampleID, int Flags) = 0;
 	virtual void Stop(int SampleID) = 0;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-12-09 21:17:26 +0000