nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 22:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

getting bored. Bulk commit of 6 files

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@465 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-11-17 18:10:46 +00:00
parent 8bc9a08ec6
commit 1755c401ea
5 changed files with 47 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_pred.c
View file

@ -405,7 +405,7 @@ void CL_PredictUsercmd (int pnum, player_state_t *from, player_state_t *to, user
pmove.onladder = false;
pmove.hullnum = from->hullnum;
if (cl.worldmodel->fromgame == fg_quake2 || pmove.hullnum > MAX_MAP_HULLSM)
if (cl.worldmodel->fromgame == fg_quake2 || cl.worldmodel->fromgame == fg_quake3 || pmove.hullnum > MAX_MAP_HULLSM)
{
player_mins[0] = -16;
player_mins[1] = -16;

5
engine/client/cl_tent.c
View file

@ -1769,9 +1769,12 @@ void CL_UpdateBeams (void)
ent->drawflags |= MLS_ABSLIGHT;
ent->abslight = 192;
ent->alpha = b->alpha;
ent->angles[0] = pitch;
ent->angles[0] = -pitch;
ent->angles[1] = yaw;
ent->angles[2] = (int)((cl.time*d*1000))%360; //paused lightning too.
AngleVectors(ent->angles, ent->axis[0], ent->axis[1], ent->axis[2]);
ent->angles[0] = pitch;
for (i=0 ; i<3 ; i++)
org[i] += dist[i]*30;

1
engine/client/screen.h
View file

@ -76,6 +76,7 @@ void SCR_CheckDrawCenterString (void);
void SCR_DrawRam (void);
void SCR_DrawNet (void);
void SCR_DrawFPS (void);
void SCR_DrawUPS (void);
void SCR_DrawTurtle (void);
void SCR_DrawPause (void);
void SCR_VRectForPlayer(vrect_t *vrect, int pnum); //returns a region for the player's view

33
engine/client/snd_ov.c
View file

@ -129,6 +129,8 @@ sfxcache_t *S_LoadOVSound (sfx_t *s)
return NULL;
}
buffer->mediaaswavpos = sizeof(sfxcache_t);
s->decoder->decodemore(s, 100);
s->cache.fake=true;
@ -137,11 +139,35 @@ sfxcache_t *S_LoadOVSound (sfx_t *s)
int OV_DecodeSome(sfx_t *s, int minlength)
{
int bigendianp = 0;
int current_section;
sfxcache_t *sc;
ovdecoderbuffer_t *dec = s->decoder->buf;
int bytesread;
// while ((bytesread = ov_read(&dec->vf, s->cache+dec->, int length, int bigendianp, int word, int sgned, int *bitstream))
// ov_read(
if (dec->mediaaswavbuflen < dec->mediaaswavpos+minlength)
{
dec->mediaaswavbuflen += minlength;
BZ_Realloc(dec->mediaaswavdata, dec->mediaaswavpos);
s->cache.data = dec->mediaaswavdata;
s->cache.fake = true;
}
sc = s->cache.data;
for (;;)
{
bytesread = p_ov_read(&dec->vf, dec->mediaaswavdata+dec->mediaaswavpos, minlength, bigendianp, 2, 1, &current_section);
if (bytesread <= 0)
return 0;
dec->mediaaswavpos += bytesread;
sc->length = (dec->mediaaswavpos-sizeof(sfxcache_t))/2;
minlength -= bytesread/2;
if (!minlength)
return 1;
}
return 0;
}
void OV_CancelDecoder(sfx_t *s)
@ -216,6 +242,7 @@ qboolean OV_StartDecode(unsigned char *start, unsigned long length, ovdecoderbuf
p_ov_pcm_total = (void *)GetProcAddress(oggvorbislibrary, "ov_pcm_total");
p_ov_clear = (void *)GetProcAddress(oggvorbislibrary, "ov_clear");
p_ov_info = (void *)GetProcAddress(oggvorbislibrary, "ov_info");
p_ov_read = (void *)GetProcAddress(oggvorbislibrary, "ov_read");
}
#else
p_ov_open_callbacks = ov_open_callbacks;

22
engine/client/snd_win.c
View file

@ -775,7 +775,7 @@ void SNDDMA_SetUnderWater(qboolean underwater)
*/
if (underwater)
{
#if 0 //phycotic.
#if 1 //phycotic.
ListenerProperties.flEnvironmentSize = 2.8;
ListenerProperties.flEnvironmentDiffusion = 0.240;
ListenerProperties.lRoom = -374;
@ -809,18 +809,18 @@ void SNDDMA_SetUnderWater(qboolean underwater)
}
else
{
ListenerProperties.flEnvironmentSize = 3.2;
ListenerProperties.flEnvironmentDiffusion = 1;
ListenerProperties.lRoom = -374;
ListenerProperties.lRoomHF = -2300;
ListenerProperties.flEnvironmentSize = 1;
ListenerProperties.flEnvironmentDiffusion = 0;
ListenerProperties.lRoom = 0;
ListenerProperties.lRoomHF = 0;
ListenerProperties.flRoomRolloffFactor = 0;
ListenerProperties.flAirAbsorptionHF = -5;
ListenerProperties.lReflections = 337;
ListenerProperties.flReflectionsDelay = 0.002;
ListenerProperties.flAirAbsorptionHF = 0;
ListenerProperties.lReflections = 1000;
ListenerProperties.flReflectionsDelay = 0;
ListenerProperties.lReverb = 813;
ListenerProperties.flReverbDelay = 0.03;
ListenerProperties.flDecayTime = 0.381;
ListenerProperties.flDecayHFRatio = 0.240;
ListenerProperties.flReverbDelay = 0.00;
ListenerProperties.flDecayTime = 0.1;
ListenerProperties.flDecayHFRatio = 0.1;
ListenerProperties.dwFlags = 0x3f;
ListenerProperties.dwEnvironment = EAX_ENVIRONMENT_GENERIC;
}