qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-30 16:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

port in some improvements from OT (namely fs_basepath, etc, though commandline parsing isn't finished yet)

Browse source 
split up the headerfiles and such. common.[ch] and qwsvdef.h no longer exist. More work still needs to be done (esp for windows) but this should be a major improvement.
This commit is contained in:
Bill Currie 2000-05-21 08:24:45 +00:00
parent e471c785d8
commit af032b8d55
121 changed files with 1055 additions and 3086 deletions
Download patch file Download diff file Expand all files Collapse all files

36
source/snd_dma.c
View file

@ -31,6 +31,11 @@
# include <config.h>
#endif
#include "sys.h"
#include "sound.h"
#include "cmd.h"
#include "console.h"
#include "client.h"
#include "qargs.h"
#include "quakedef.h"
#ifdef _WIN32
@ -38,6 +43,9 @@
#include "in_win.h"
#endif
#include <string.h>
#include <stdlib.h>
void S_Play(void);
void S_PlayVol(void);
void S_SoundList(void);
@ -320,12 +328,12 @@ sfx_t *S_FindName (char *name)
if (!name)
Sys_Error ("S_FindName: NULL\n");
if (Q_strlen(name) >= MAX_QPATH)
if (strlen(name) >= MAX_QPATH)
Sys_Error ("Sound name too long: %s", name);
// see if already loaded
for (i=0 ; i < num_sfx ; i++)
if (!Q_strcmp(known_sfx[i].name, name))
if (!strcmp(known_sfx[i].name, name))
{
return &known_sfx[i];
}
@ -589,7 +597,7 @@ void S_StopAllSounds(qboolean clear)
if (channels[i].sfx)
channels[i].sfx = NULL;
Q_memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
if (clear)
S_ClearBuffer ();
@ -645,7 +653,7 @@ void S_ClearBuffer (void)
}
}
Q_memset(pData, clear, shm->samples * shm->samplebits/8);
memset(pData, clear, shm->samples * shm->samplebits/8);
pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0);
@ -653,7 +661,7 @@ void S_ClearBuffer (void)
else
#endif
{
Q_memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
}
}
@ -976,13 +984,13 @@ void S_Play(void)
i = 1;
while (i<Cmd_Argc())
{
if (!Q_strrchr(Cmd_Argv(i), '.'))
if (!strrchr(Cmd_Argv(i), '.'))
{
Q_strcpy(name, Cmd_Argv(i));
Q_strcat(name, ".wav");
strcpy(name, Cmd_Argv(i));
strcat(name, ".wav");
}
else
Q_strcpy(name, Cmd_Argv(i));
strcpy(name, Cmd_Argv(i));
sfx = S_PrecacheSound(name);
S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
i++;
@ -1000,15 +1008,15 @@ void S_PlayVol(void)
i = 1;
while (i<Cmd_Argc())
{
if (!Q_strrchr(Cmd_Argv(i), '.'))
if (!strrchr(Cmd_Argv(i), '.'))
{
Q_strcpy(name, Cmd_Argv(i));
Q_strcat(name, ".wav");
strcpy(name, Cmd_Argv(i));
strcat(name, ".wav");
}
else
Q_strcpy(name, Cmd_Argv(i));
strcpy(name, Cmd_Argv(i));
sfx = S_PrecacheSound(name);
vol = Q_atof(Cmd_Argv(i+1));
vol = atof(Cmd_Argv(i+1));
S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
i+=2;
}