FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

29 Jan 2017

This commit is contained in:
g-cont 2017-01-29 00:00:00 +03:00 committed by Alibek Omarov
parent 203a9fbd95
commit 537f5cf039
10 changed files with 54 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/client/s_main.c
View File

@ -701,8 +701,11 @@ qboolean SND_CheckPHS( channel_t *ch )
{
mleaf_t *leaf;
if( !ch->dist_mult || !s_phs->integer )
return true; // no attenuation
if( !s_phs->integer )
return true;
if( !ch->dist_mult && ch->entnum )
return true; // no attenuation
if( ch->movetype == MOVETYPE_PUSH )
{
@ -1146,6 +1149,7 @@ void S_AmbientSound( const vec3_t pos, int ent, sound_t handle, float fvol, floa
if( pos ) VectorCopy( pos, ch->origin );
else VectorClear( ch->origin );
ch->entnum = ent;
CL_GetEntitySpatialization( ch );
@ -1186,7 +1190,6 @@ void S_AmbientSound( const vec3_t pos, int ent, sound_t handle, float fvol, floa
ch->dist_mult = (attn / SND_CLIP_DISTANCE);
ch->entchannel = CHAN_STATIC;
ch->basePitch = pitch;
ch->entnum = ent;
ch->radius = radius;
// initialize gain due to obscured sound source

3
engine/client/s_mix.c
View File

@ -574,7 +574,8 @@ void MIX_MixChannelsToPaintbuffer( int endtime, int rate, int outputRate )
if( !bZeroVolume )
{
if( ch->leftvol <= 5 && ch->rightvol <= 5 )
// this values matched with GoldSrc
if( ch->leftvol < 8 && ch->rightvol < 8 )
bZeroVolume = true;
}

6
engine/common/filesystem.c
View File

@ -1059,7 +1059,7 @@ void FS_CreateDefaultGameInfo( const char *filename )
defGI.max_edicts = 900; // default value if not specified
defGI.max_tents = 500;
defGI.max_beams = 128;
defGI.soundclip_dist = 1536;
defGI.soundclip_dist = 1000;
defGI.max_particles = 4096;
defGI.version = 1.0;
defGI.falldir[0] = '\0';
@ -1105,7 +1105,7 @@ static qboolean FS_ParseLiblistGam( const char *filename, const char *gamedir, g
GameInfo->max_edicts = 900; // default value if not specified
GameInfo->max_tents = 500;
GameInfo->max_beams = 128;
GameInfo->soundclip_dist = 1536;
GameInfo->soundclip_dist = 1000;
GameInfo->max_particles = 4096;
GameInfo->version = 1.0f;
GameInfo->falldir[0] = '\0';
@ -1282,7 +1282,7 @@ static qboolean FS_ParseGameInfo( const char *gamedir, gameinfo_t *GameInfo )
GameInfo->max_edicts = 900; // default value if not specified
GameInfo->max_tents = 500;
GameInfo->max_beams = 128;
GameInfo->soundclip_dist = 1536;
GameInfo->soundclip_dist = 1000;
GameInfo->max_particles = 4096;
GameInfo->version = 1.0f;
GameInfo->falldir[0] = '\0';

BIN
engine/common/soundlib/mpeg.lib
View File

Binary file not shown.

BIN
engine/common/soundlib/mpeg_dbg.lib
View File

Binary file not shown.

99
engine/common/soundlib/snd_mp3.c
View File

@ -24,13 +24,17 @@ GNU General Public License for more details.
#define MP3_OK 0
#define MP3_NEED_MORE 1
#define FRAME_SIZE 32768//16384 // must match with mp3 frame size
typedef struct mpeg_s
{
void *state; // hidden decoder state
void *vbrtag; // valid for VBR-encoded mpegs
void *file;
// custom stdio
long (*fread)( void *handle, void *buf, size_t count );
long (*fseek)( void *handle, long offset, int whence );
void (*close)( void *handle );
// user info
int channels; // num channels
int samples; // per one second
int play_time; // stream size in milliseconds
@ -38,15 +42,19 @@ typedef struct mpeg_s
int outsize; // current data size
char out[8192]; // temporary buffer
size_t streamsize; // size in bytes
char error[256]; // error buffer
} mpeg_t;
// mpg123 exports
int create_decoder( mpeg_t *mpg );
int read_mpeg_header( mpeg_t *mpg, const char *data, long bufsize, long streamsize );
int read_mpeg_stream( mpeg_t *mpg, const char *data, long bufsize );
extern int set_current_pos( mpeg_t *mpg, int newpos, int (*pfnSeek)( void*, long, int ), void *file );
int get_current_pos( mpeg_t *mpg, int curpos );
void close_decoder( mpeg_t *mpg );
extern int create_decoder( mpeg_t *mpg );
extern int feed_mpeg_header( mpeg_t *mpg, const char *data, long bufsize, long streamsize );
extern int feed_mpeg_stream( mpeg_t *mpg, const char *data, long bufsize );
extern int open_mpeg_stream( mpeg_t *mpg, void *file );
extern int read_mpeg_stream( mpeg_t *mpg );
extern int get_stream_pos( mpeg_t *mpg );
extern int set_stream_pos( mpeg_t *mpg, int curpos );
extern void close_decoder( mpeg_t *mpg );
/*
=================================================================
@ -67,12 +75,15 @@ qboolean Sound_LoadMPG( const char *name, const byte *buffer, size_t filesize )
// couldn't create decoder
if( !create_decoder( &mpeg ))
{
MsgDev( D_ERROR, "%s\n", mpeg.error );
return false;
}
// trying to read header
if( !read_mpeg_header( &mpeg, buffer, FRAME_SIZE, filesize ))
if( !feed_mpeg_header( &mpeg, buffer, FRAME_SIZE, filesize ))
{
MsgDev( D_ERROR, "Sound_LoadMPG: (%s) is probably corrupted\n", name );
MsgDev( D_ERROR, "Sound_LoadMPG: (%s) is probably corrupted (%s)\n", name, mpeg.error );
close_decoder( &mpeg );
return false;
}
@ -100,7 +111,7 @@ qboolean Sound_LoadMPG( const char *name, const byte *buffer, size_t filesize )
{
int outsize;
if( read_mpeg_stream( &mpeg, NULL, 0 ) != MP3_OK )
if( feed_mpeg_stream( &mpeg, NULL, 0 ) != MP3_OK && mpeg.outsize <= 0 )
{
char *data = (char *)buffer + pos;
int bufsize;
@ -111,7 +122,7 @@ qboolean Sound_LoadMPG( const char *name, const byte *buffer, size_t filesize )
else bufsize = FRAME_SIZE;
pos += bufsize;
if( read_mpeg_stream( &mpeg, data, bufsize ) != MP3_OK )
if( feed_mpeg_stream( &mpeg, data, bufsize ) != MP3_OK )
break; // there was end of the stream
}
@ -139,20 +150,10 @@ stream_t *Stream_OpenMPG( const char *filename )
mpeg_t *mpegFile;
stream_t *stream;
file_t *file;
long filesize, read_len;
char tempbuff[FRAME_SIZE];
file = FS_Open( filename, "rb", false );
if( !file ) return NULL;
filesize = FS_FileLength( file );
if( filesize < FRAME_SIZE )
{
MsgDev( D_ERROR, "Stream_OpenMPG: %s is probably corrupted\n", filename );
FS_Close( file );
return NULL;
}
// at this point we have valid stream
stream = Mem_Alloc( host.soundpool, sizeof( stream_t ));
stream->file = file;
@ -163,28 +164,21 @@ stream_t *Stream_OpenMPG( const char *filename )
// couldn't create decoder
if( !create_decoder( mpegFile ))
{
MsgDev( D_ERROR, "Stream_OpenMPG: couldn't create decoder\n" );
MsgDev( D_ERROR, "Stream_OpenMPG: couldn't create decoder: %s\n", mpegFile->error );
Mem_Free( mpegFile );
Mem_Free( stream );
FS_Close( file );
return NULL;
}
read_len = FS_Read( file, tempbuff, sizeof( tempbuff ));
if( read_len < sizeof( tempbuff ))
{
MsgDev( D_ERROR, "Stream_OpenMPG: %s is probably corrupted\n", filename );
close_decoder( mpegFile );
Mem_Free( mpegFile );
Mem_Free( stream );
FS_Close( file );
return NULL;
}
mpegFile->fread = FS_Read;
mpegFile->fseek = FS_Seek;
mpegFile->close = FS_Close;
// trying to read header
if( !read_mpeg_header( mpegFile, tempbuff, sizeof( tempbuff ), filesize ))
// trying to open stream and read header
if( !open_mpeg_stream( mpegFile, file ))
{
MsgDev( D_ERROR, "Sound_LoadMPG: (%s) is probably corrupted\n", filename );
MsgDev( D_ERROR, "Sound_LoadMPG: (%s) is probably corrupted: %s\n", filename, mpegFile->error );
close_decoder( mpegFile );
Mem_Free( mpegFile );
Mem_Free( stream );
@ -222,32 +216,18 @@ long Stream_ReadMPG( stream_t *stream, long needBytes, void *buffer )
while( 1 )
{
char tempbuff[FRAME_SIZE];
long read_len, outsize;
long outsize;
byte *data;
if( !stream->buffsize )
{
if( stream->timejump )
{
int numReads = 0;
// flush all the previous data
while( read_mpeg_stream( mpg, NULL, 0 ) == MP3_OK && numReads++ < 255 );
read_len = FS_Read( stream->file, tempbuff, sizeof( tempbuff ));
result = read_mpeg_stream( mpg, tempbuff, read_len );
stream->timejump = false;
bytesWritten = 0;
}
else result = read_mpeg_stream( mpg, NULL, 0 );
result = read_mpeg_stream( mpg );
stream->pos += mpg->outsize;
if( result != MP3_OK )
{
// if there are no bytes remainig so we can decompress the new frame
read_len = FS_Read( stream->file, tempbuff, sizeof( tempbuff ));
result = read_mpeg_stream( mpg, tempbuff, read_len );
result = read_mpeg_stream( mpg );
stream->pos += mpg->outsize;
if( result != MP3_OK )
@ -286,13 +266,11 @@ assume stream is valid
*/
long Stream_SetPosMPG( stream_t *stream, long newpos )
{
// update stream pos for right work GetPos function
int newPos = set_current_pos( stream->ptr, newpos, FS_Seek, stream->file );
int newPos = set_stream_pos( stream->ptr, newpos );
if( newPos != -1 )
{
stream->pos = newPos;
stream->timejump = true;
stream->buffsize = 0;
return true;
}
@ -310,7 +288,7 @@ assume stream is valid
*/
long Stream_GetPosMPG( stream_t *stream )
{
return get_current_pos( stream->ptr, stream->pos );
return get_stream_pos( stream->ptr );
}
/*
@ -331,10 +309,5 @@ void Stream_FreeMPG( stream_t *stream )
Mem_Free( stream->ptr );
}
if( stream->file )
{
FS_Close( stream->file );
}
Mem_Free( stream );
}

6
engine/common/soundlib/snd_wav.c
View File

@ -267,11 +267,11 @@ qboolean Sound_LoadWAV( const char *name, const byte *buffer, size_t filesize )
{
int hdr_size = (iff_dataPtr - buffer);
if(( filesize - hdr_size ) < 16384 )
if(( filesize - hdr_size ) < FRAME_SIZE )
{
sound.tempbuffer = (byte *)Mem_Realloc( host.soundpool, sound.tempbuffer, 16384 );
sound.tempbuffer = (byte *)Mem_Realloc( host.soundpool, sound.tempbuffer, FRAME_SIZE );
memcpy( sound.tempbuffer, buffer + (iff_dataPtr - buffer), filesize - hdr_size );
return Sound_LoadMPG( name, sound.tempbuffer, 16384 );
return Sound_LoadMPG( name, sound.tempbuffer, FRAME_SIZE );
}
return Sound_LoadMPG( name, buffer + hdr_size, filesize - hdr_size );

2
engine/common/soundlib/soundlib.h
View File

@ -18,6 +18,8 @@ GNU General Public License for more details.
#include "common.h"
#define FRAME_SIZE 32768 // must match with mp3 frame size
typedef struct loadwavfmt_s
{
const char *formatstring;

2
engine/engine.dsp
View File

@ -102,7 +102,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
# ADD LINK32 msvcrtd.lib user32.lib gdi32.lib shell32.lib advapi32.lib winmm.lib mpeg_dbg.lib ../utils/vgui/lib/win32_vc6/vgui.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\temp\engine\!debug/xash.dll" /pdbtype:sept /libpath:"./common/soundlib"
# ADD LINK32 msvcrtd.lib user32.lib gdi32.lib shell32.lib advapi32.lib winmm.lib mpeg_dbg.lib ../utils/vgui/lib/win32_vc6/vgui.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcmtd" /out:"..\temp\engine\!debug/xash.dll" /pdbtype:sept /libpath:"./common/soundlib"
# SUBTRACT LINK32 /incremental:no /map /nodefaultlib
# Begin Custom Build
TargetDir=\Xash3D\src_main\temp\engine\!debug

2
engine/server/sv_init.c
View File

@ -317,7 +317,7 @@ void SV_ActivateServer( void )
// Activate the DLL server code
svgame.dllFuncs.pfnServerActivate( svgame.edicts, svgame.numEntities, svgame.globals->maxClients );
if( sv.loadgame || svgame.globals->changelevel )
if( sv.loadgame && !svgame.globals->changelevel )
{
sv.frametime = 0.001;
numFrames = 1;