yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-31 05:10:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #50 from bibendovsky/lpf

Browse source 
Fix underwater sfx in demos
This commit is contained in:
Yamagi 2014-08-23 16:42:07 +02:00
commit 637aae9021
2 changed files with 72 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/cl_network.c
View file

@ -25,6 +25,7 @@
*/
#include "header/client.h"
#include "../client/sound/header/local.h"
void CL_ParseStatusMessage(void);
@ -354,6 +355,8 @@ CL_Disconnect(void)
}
cls.state = ca_disconnected;
snd_is_underwater = false;
}
void

94
src/common/pmove.c
View file

@ -27,6 +27,7 @@
#include "header/common.h"
#include "../client/sound/header/local.h"
#include "../client/header/client.h"
#if !defined(DEDICATED_ONLY) && defined(USE_OPENAL)
void AL_Underwater();
@ -1265,16 +1266,73 @@ PM_ClampAngles(void)
AngleVectors(pm->viewangles, pml.forward, pml.right, pml.up);
}
void PM_CalculateViewHeightForDemo()
{
if (pm->s.pm_type == PM_GIB)
pm->viewheight = 8;
else {
if ((pm->s.pm_flags & PMF_DUCKED) != 0)
pm->viewheight = -2;
else
pm->viewheight = 22;
}
}
void PM_CalculateWaterLevelForDemo()
{
vec3_t point;
int cont;
point[0] = pml.origin[0];
point[1] = pml.origin[1];
point[2] = pml.origin[2] + pm->viewheight;
pm->waterlevel = 0;
pm->watertype = 0;
cont = pm->pointcontents(point);
if ((cont & MASK_WATER) != 0) {
pm->waterlevel = 3;
pm->watertype = cont;
}
}
void PM_UpdateUnderwaterSfx()
{
#if !defined(DEDICATED_ONLY)
static int underwater;
#endif
#if !defined(DEDICATED_ONLY)
if ((pm->waterlevel == 3) && !underwater) {
underwater = 1;
snd_is_underwater = 1;
#ifdef USE_OPENAL
if (snd_is_underwater_enabled)
AL_Underwater();
#endif
}
if ((pm->waterlevel < 3) && underwater) {
underwater = 0;
snd_is_underwater = 0;
#ifdef USE_OPENAL
if (snd_is_underwater_enabled)
AL_Overwater();
#endif
}
#endif
}
/*
* Can be called by either the server or the client
*/
void
Pmove(pmove_t *pmove)
{
#if !defined(DEDICATED_ONLY)
static int underwater;
#endif
pm = pmove;
/* clear results */
@ -1320,6 +1378,12 @@ Pmove(pmove_t *pmove)
if (pm->s.pm_type == PM_FREEZE)
{
if (cl.attractloop) {
PM_CalculateViewHeightForDemo();
PM_CalculateWaterLevelForDemo();
PM_UpdateUnderwaterSfx();
}
return; /* no movement at all */
}
@ -1415,27 +1479,7 @@ Pmove(pmove_t *pmove)
/* set groundentity, watertype, and waterlevel for final spot */
PM_CatagorizePosition();
#if !defined(DEDICATED_ONLY)
if ((pm->waterlevel == 3) && !underwater)
{
underwater = 1;
snd_is_underwater = 1;
#ifdef USE_OPENAL
if (snd_is_underwater_enabled)
AL_Underwater();
#endif
}
if (((pm->waterlevel < 3) && underwater))
{
underwater = 0;
snd_is_underwater = 0;
#ifdef USE_OPENAL
if (snd_is_underwater_enabled)
AL_Overwater();
#endif
}
#endif
PM_UpdateUnderwaterSfx();
PM_SnapPosition();
}