eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Trying to fix stuff from last commit.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4002 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-02-27 13:55:23 +00:00
parent 4149c85ab6
commit 95569fc5dd
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
engine/client/m_mp3.c
View file

@ -3100,6 +3100,24 @@ sfxcache_t *S_MP3_Locate(sfx_t *sfx, sfxcache_t *buf, int start, int length)
}
return buf;
}
#ifndef WAVE_FORMAT_MPEGLAYER3
#define WAVE_FORMAT_MPEGLAYER3 0x0055
#define MPEGLAYER3_WFX_EXTRA_BYTES 12
#define MPEGLAYER3_FLAG_PADDING_OFF 2
#define MPEGLAYER3_ID_MPEG 1
typedef struct
{
WAVEFORMATEX wfx;
WORD wID;
DWORD fdwFlags;
WORD nBlockSize;
WORD nFramesPerBlock;
WORD nCodecDelay;
} MPEGLAYER3WAVEFORMAT;
#endif
qboolean S_LoadMP3Sound (sfx_t *s, qbyte *data, int datalen, int sndspeed)
{
WAVEFORMATEX pcm_format;
@ -3147,9 +3165,9 @@ qboolean S_LoadMP3Sound (sfx_t *s, qbyte *data, int datalen, int sndspeed)
mp3format.wfx.nBlockAlign = 1; // MUST BE ONE
mp3format.wfx.nSamplesPerSec = dec->srcspeed; // 44.1kHz
mp3format.fdwFlags = MPEGLAYER3_FLAG_PADDING_OFF;
mp3format.nBlockSize = 522; // voodoo value #1
mp3format.nBlockSize = 522; // voodoo value #1 - 144 x (bitrate / sample rate) + padding
mp3format.nFramesPerBlock = 1; // MUST BE ONE
mp3format.nCodecDelay = 1393; // voodoo value #2
mp3format.nCodecDelay = 0;//1393; // voodoo value #2
mp3format.wID = MPEGLAYER3_ID_MPEG;
if (!qacmStartup() || 0!=qacmStreamOpen(&dec->acm, drv, (WAVEFORMATEX*)&mp3format, &pcm_format, NULL, 0, 0, 0))

2
engine/common/q1bsp.c
View file

@ -368,6 +368,7 @@ struct traceinfo_s
vec3_t end;
};
#if 0
#include "shader.h"
void TestDrawPlane(float *normal, float dist, float r, float g, float b)
{
@ -446,6 +447,7 @@ void TestDrawPlane(float *normal, float dist, float r, float g, float b)
t->numidx = cl_numstrisidx - t->firstidx;
t->numvert += 4;
}
#endif
static void Q1BSP_ClipToBrushes(struct traceinfo_s *traceinfo, mbrush_t *brush)
{

2
engine/common/zone.c
View file

@ -1677,7 +1677,9 @@ void *Cache_Check(cache_user_t *c)
void Cache_Flush(void)
{
#ifndef SERVERONLY
S_Purge(false);
#endif
while(cache_head)
{
Cache_Free(cache_head->user);