zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ambience sound for 3d-mode mapster. Some consistency problems remain.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1251 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2009-03-17 21:57:30 +00:00
parent 38458d1a54
commit 8d1da3e070
3 changed files with 119 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
polymer/eduke32/source/astub.c
View file

@ -1582,7 +1582,7 @@ ENDFOR1:
}
#define SOUND_NUMDISPLINES IHELP_NUMDISPLINES
extern char SoundToggle;
//extern char SoundToggle;
static int32_t compare_sounds_s(int16_t k1, int16_t k2)
{
@ -1739,9 +1739,10 @@ static void SoundDisplay()
printext16(8L,ydim2d-overridepm16y+8L,editorcolors[12],-1,tempbuf,0);
enddrawing();
SoundToggle = 1;
// SoundToggle = 1;
while (keystatus[KEYSC_ESC]==0 && keystatus[KEYSC_Q]==0 && keystatus[KEYSC_F2]==0)
while (keystatus[KEYSC_ESC]==0 && keystatus[KEYSC_Q]==0 && keystatus[KEYSC_F2]==0
&& keystatus[buildkeys[BK_MODE2D_3D]]==0) // quickjump to 3d mode
{
if (handleevents())
{
@ -1920,13 +1921,93 @@ static void SoundDisplay()
FX_StopAllSounds();
S_ClearSoundLocks();
SoundToggle = 0;
// SoundToggle = 0;
keystatus[KEYSC_ESC] = keystatus[KEYSC_Q] = keystatus[KEYSC_F2] = 0;
}
}
// PK_ ^^^^
// from sector.c
static int32_t dist(spritetype *s1,spritetype *s2)
{
int32_t x= klabs(s1->x-s2->x);
int32_t y= klabs(s1->y-s2->y);
int32_t z= klabs((s1->z-s2->z)>>4);
if (x<y) swaplong(&x,&y);
if (x<z) swaplong(&x,&z);
{
int32_t t = y + z;
return (x - (x>>4) + (t>>2) + (t>>3));
}
}
extern int32_t NumVoices;
extern int32_t g_numEnvSoundsPlaying;
int32_t AmbienceToggle = 1; //SoundToggle;
#define T1 (s->filler)
#define T2 (s->filler)
// adapted from actors.c
static void M32_MoveFX(void)
{
int32_t i, j;
int32_t x, ht;
spritetype *s;
for (i=headspritestat[0]; i>=0; i=nextspritestat[i])
{
s = &sprite[i];
if (s->picnum == MUSICANDSFX)
{
ht = s->hitag;
if ((T2&2) != AmbienceToggle<<1)
{
T2 |= AmbienceToggle<<1;
T1 &= (~1);
}
else if (s->lotag < 999 && (unsigned)sector[s->sectnum].lotag < 9 &&
AmbienceToggle && sector[s->sectnum].floorz != sector[s->sectnum].ceilingz)
{
if ((g_sounds[s->lotag].m&2))
{
x = dist((spritetype*)&pos,s);
if (x < ht && (T1&1) == 0 && FX_VoiceAvailable(g_sounds[s->lotag].pr-1))
{
if (g_numEnvSoundsPlaying == NumVoices)
{
for (j = headspritestat[0]; j >= 0; j = nextspritestat[j])
{
if (s->picnum == MUSICANDSFX && j != i && sprite[j].lotag < 999 &&
(sprite[j].filler&1) == 1 && /*ActorExtra[j].temp_data[0] == 1 &&*/
dist(&sprite[j],(spritetype*)&pos) > x)
{
S_StopEnvSound(sprite[j].lotag,j);
break;
}
}
if (j == -1) continue;
}
A_PlaySound(s->lotag,i);
T1 |= 1;
}
if (x >= ht && (T1&1) == 1)
{
T1 &= (~1);
S_StopEnvSound(s->lotag,i);
}
}
}
}
}
}
static void Show3dText(char *name)
{
int32_t fp,t;
@ -3905,6 +3986,12 @@ static void Keys3d(void)
}
*/
if (g_numsounds > 0 && AmbienceToggle)
{
M32_MoveFX();
S_Pan3D();
}
if (usedcount && !helpon)
{
if (searchstat!=3)
@ -4122,6 +4209,18 @@ static void Keys3d(void)
keystatus[KEYSC_F3] = 0;
}
if (keystatus[KEYSC_F4])
{
AmbienceToggle = 1-AmbienceToggle;
message("Ambience sounds: %s",AmbienceToggle?"enabled":"disabled");
if (!AmbienceToggle)
{
FX_StopAllSounds();
S_ClearSoundLocks();
}
keystatus[KEYSC_F4] = 0;
}
// PK
if (keystatus[KEYSC_F5])
{
@ -5493,7 +5592,11 @@ static void Keys3d(void)
else SetGAMEPalette();
if (keystatus[buildkeys[BK_MODE2D_3D]]) // Enter
{
SetGAMEPalette();
FX_StopAllSounds();
S_ClearSoundLocks();
}
//Stick this in 3D part of ExtCheckKeys
//Also choose your own key scan codes
@ -8883,8 +8986,10 @@ int32_t parseconsounds(scriptfile *script)
}
else
{
numsounds += parseconsounds(included);
int32_t tmp = parseconsounds(included);
scriptfile_close(included);
if (tmp < 0) return tmp;
numsounds += tmp;
}
}
break;
@ -8996,7 +9101,9 @@ int32_t loadconsounds(char *fn)
return -1;
}
ret = parseconsounds(script);
if (ret == 0)
if (ret < 0)
initprintf("There was an error parsing '%s'.\n", fn);
else if (ret == 0)
initprintf("'%s' doesn't contain sound definitions. No sounds loaded.\n", fn);
else
initprintf("Loaded %d sound definitions.\n", ret);

8
polymer/eduke32/source/sounds_mapster32.c
View file

@ -53,7 +53,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static char SM32_havesound = 0;
extern sound_t g_sounds[MAXSOUNDS];
char SoundToggle = 0;
char SoundToggle = 1;
int32_t NumVoices = 32;
int32_t backflag,g_numEnvSoundsPlaying;
@ -75,7 +76,7 @@ int32_t S_SoundStartup(void)
int32_t status, err = 0;
// TODO: read config
int32_t FXVolume=220, NumVoices=32, NumChannels=2, NumBits=16, MixRate, ReverseStereo=0;
int32_t FXVolume=220, /*NumVoices=32,*/ NumChannels=2, NumBits=16, MixRate, ReverseStereo=0;
#if defined(_WIN32)
MixRate = 44100;
#else
@ -178,7 +179,7 @@ extern int16_t ang, cursectnum;
int32_t S_PlaySoundXYZ(int32_t num, int32_t i, const vec3_t *pos)
{
int32_t sndist, cx, cy, cz, j,k;
int32_t sndist, cx, cy, cz, j/*,k*/;
int32_t pitche,pitchs,cs;
int32_t voice, sndang, ca, pitch;
@ -519,6 +520,7 @@ void S_TestSoundCallback(uint32_t num)
if (sprite[i].picnum == MUSICANDSFX && sector[sprite[i].sectnum].lotag < 3 && sprite[i].lotag < 999)
{
// ActorExtra[i].temp_data[0] = 0;
sprite[i].filler &= (~1);
if ((j + 1) < k)
{
g_sounds[num].SoundOwner[j].voice = g_sounds[num].SoundOwner[k-1].voice;

2
polymer/eduke32/source/sounds_mapster32.h
View file

@ -23,6 +23,7 @@ int32_t S_SoundStartup(void);
void S_SoundShutdown(void);
int32_t S_PlaySoundXYZ(int32_t, int32_t, const vec3_t*);
void S_PlaySound(int32_t);
int32_t A_PlaySound(uint32_t num, int32_t i);
void A_StopSound(int32_t num, int32_t i);
void S_StopSound(int32_t num);
void S_StopEnvSound(int32_t num,int32_t i);
@ -31,7 +32,6 @@ int32_t A_CheckSoundPlaying(int32_t i, int32_t num);
int32_t S_CheckSoundPlaying(int32_t i, int32_t num);
void S_ClearSoundLocks(void);
#define MAXSOUNDS 2560
#endif