zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 00:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into float

Browse source 
# Conflicts:
#	src/g_hexen/a_fighterplayer.cpp
This commit is contained in:
Christoph Oelckers 2016-03-16 22:45:55 +01:00
commit ec3be2531a
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_hexen/a_fighterplayer.cpp
View file

@ -27,7 +27,7 @@ static FRandom pr_fpatk ("FPunchAttack");
void AdjustPlayerAngle (AActor *pmo, FTranslatedLineTarget *t) void AdjustPlayerAngle (AActor *pmo, FTranslatedLineTarget *t)
{ {
DAngle difference = deltaangle(pmo->Angles.Yaw, t->angleFromSource); DAngle difference = deltaangle(pmo->Angles.Yaw, pmo->_f_AngleTo(t->linetarget););
if (fabs(difference) > MAX_ANGLE_ADJUST) if (fabs(difference) > MAX_ANGLE_ADJUST)
{ {
if (difference > 0) if (difference > 0)

2
src/p_map.cpp
View file

@ -4939,7 +4939,7 @@ bool P_TalkFacing(AActor *player)
if (t.linetarget != NULL) if (t.linetarget != NULL)
{ {
if (t.linetarget->health > 0 && // Dead things can't talk. if (t.linetarget->health > 0 && // Dead things can't talk.
t.linetarget->flags4 & MF4_INCOMBAT && // Fighting things don't talk either. !(t.linetarget->flags4 & MF4_INCOMBAT) && // Fighting things don't talk either.
t.linetarget->Conversation != NULL) t.linetarget->Conversation != NULL)
{ {
// Give the NPC a chance to play a brief animation // Give the NPC a chance to play a brief animation

16
src/sound/fmodsound.cpp
View file

@ -109,6 +109,18 @@ CUSTOM_CVAR (Float, snd_waterlp, 250, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
} }
} }
CUSTOM_CVAR (Int, snd_streambuffersize, 64, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
{
if (self < 16)
{
self = 16;
}
else if (self > 1024)
{
self = 1024;
}
}
#ifndef NO_FMOD #ifndef NO_FMOD
#if FMOD_VERSION < 0x43400 #if FMOD_VERSION < 0x43400
#define FMOD_OPENSTATE_PLAYING FMOD_OPENSTATE_STREAMING #define FMOD_OPENSTATE_PLAYING FMOD_OPENSTATE_STREAMING
@ -1168,9 +1180,7 @@ bool FMODSoundRenderer::Init()
} }
Sys->set3DSettings(0.5f, 96.f, 1.f); Sys->set3DSettings(0.5f, 96.f, 1.f);
Sys->set3DRolloffCallback(RolloffCallback); Sys->set3DRolloffCallback(RolloffCallback);
// The default is 16k, which periodically starves later FMOD versions Sys->setStreamBufferSize(snd_streambuffersize * 1024, FMOD_TIMEUNIT_RAWBYTES);
// when streaming FLAC files.
Sys->setStreamBufferSize(64*1024, FMOD_TIMEUNIT_RAWBYTES);
snd_sfxvolume.Callback (); snd_sfxvolume.Callback ();
return true; return true;
} }

2
src/textures/multipatchtexture.cpp
View file

@ -1148,7 +1148,7 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part, bool silent, i
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetNumber(); sc.MustGetNumber();
b = sc.Number; b = sc.Number;
sc.MustGetStringName(","); //sc.MustGetStringName(","); This was never supposed to be here.
part.Blend = MAKERGB(r, g, b); part.Blend = MAKERGB(r, g, b);
} }
// Blend.a may never be 0 here. // Blend.a may never be 0 here.