mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
November 11, 2007 (Changes by Graf Zahl)
- Fixed: The FMOD stream player must specify whether it wants to play the sound looped or not when playback is started, not when the stream is created. - Fixed: A_Saw didn't use the puff's damage type. - Fixed: The AxeBlood's death state was using the wrong sprite frame. - Fixed: The Mancubus had an attack sound defined even though it shouldn't. SVN r565 (trunk)
This commit is contained in:
parent
c9aaf8460b
commit
912f8666d7
16 changed files with 2386 additions and 2460 deletions
|
@ -1,3 +1,16 @@
|
|||
November 11, 2007 (Changes by Graf Zahl)
|
||||
- Fixed: The FMOD stream player must specify whether it wants to play the
|
||||
sound looped or not when playback is started, not when the stream is created.
|
||||
- Fixed: A_Saw didn't use the puff's damage type.
|
||||
- Fixed: The AxeBlood's death state was using the wrong sprite frame.
|
||||
|
||||
November 10, 2007 (Changes by Graf Zahl)
|
||||
- Fixed: The Mancubus had an attack sound defined even though it shouldn't.
|
||||
|
||||
November 9, 2007 (Changes by Graf Zahl)
|
||||
- Fixed: ACS's CheckWeapon must do a case insensitive string comparison to
|
||||
compare the weapon name with the ready weapon's type.
|
||||
|
||||
November 8, 2007 (Changes by Graf Zahl)
|
||||
- Changed PowerFlight so that Hexen's infiniteness is not controlled by being
|
||||
in a hub but by a level flag instead.
|
||||
|
|
|
@ -141,7 +141,7 @@ void A_Saw (AActor *actor)
|
|||
// use meleerange + 1 so the puff doesn't skip the flash (i.e. plays all states)
|
||||
P_LineAttack (actor, angle, MELEERANGE+1,
|
||||
P_AimLineAttack (actor, angle, MELEERANGE+1), damage,
|
||||
NAME_None, pufftype);
|
||||
GetDefaultByType(pufftype)->DamageType, pufftype);
|
||||
|
||||
if (!linetarget)
|
||||
{
|
||||
|
|
|
@ -687,7 +687,7 @@ void A_MinotaurAtk3 (AActor *actor)
|
|||
}
|
||||
else
|
||||
{
|
||||
mo = P_SpawnMissileZ (actor, ONFLOORZ, actor->target, RUNTIME_CLASS(AMinotaurFX2));
|
||||
mo = P_SpawnMissile (actor, actor->target, RUNTIME_CLASS(AMinotaurFX2));
|
||||
if (mo != NULL)
|
||||
{
|
||||
S_Sound (mo, CHAN_WEAPON, "minotaur/attack1", 1, ATTN_NORM);
|
||||
|
|
|
@ -4679,7 +4679,7 @@ int DLevelScript::RunScript ()
|
|||
}
|
||||
else
|
||||
{
|
||||
STACK(1) = 0 == strcmp (FBehavior::StaticLookupString (STACK(1)),
|
||||
STACK(1) = 0 == stricmp (FBehavior::StaticLookupString (STACK(1)),
|
||||
activator->player->ReadyWeapon->GetClass()->TypeName.GetChars());
|
||||
}
|
||||
break;
|
||||
|
|
4803
src/sc_man_scanner.h
4803
src/sc_man_scanner.h
File diff suppressed because it is too large
Load diff
|
@ -156,7 +156,7 @@ std2:
|
|||
(D+ E FS?) | (D* "." D+ E? FS?) | (D+ "." D* E? FS?)
|
||||
{ RET(TK_FloatConst); }
|
||||
|
||||
(["] (ESC|any\[\n\\"])* ["])
|
||||
(["](([\\]["])|[^"])*["])
|
||||
{ RET(TK_StringConst); }
|
||||
|
||||
(['] (any\[\n'])* ['])
|
||||
|
|
|
@ -111,7 +111,7 @@ struct AltSoundRenderer::Stream : public SoundStream
|
|||
DeleteCriticalSection (&CriticalSection);
|
||||
}
|
||||
|
||||
bool Play (float volume)
|
||||
bool Play (bool looping, float volume)
|
||||
{
|
||||
EnterCriticalSection (&CriticalSection);
|
||||
Paused = false;
|
||||
|
|
|
@ -137,8 +137,9 @@ public:
|
|||
Stream = stream;
|
||||
}
|
||||
|
||||
bool Play (float volume)
|
||||
bool Play (bool looping, float volume)
|
||||
{
|
||||
FSOUND_Stream_SetMode(Stream, looping? FSOUND_LOOP_NORMAL : FSOUND_LOOP_OFF);
|
||||
Channel = FSOUND_Stream_PlayEx (FSOUND_FREE, Stream, NULL, true);
|
||||
if (Channel != -1)
|
||||
{
|
||||
|
|
|
@ -51,7 +51,7 @@ public:
|
|||
Loop = 4
|
||||
};
|
||||
|
||||
virtual bool Play (float volume) = 0;
|
||||
virtual bool Play (bool looping, float volume) = 0;
|
||||
virtual void Stop () = 0;
|
||||
virtual void SetVolume (float volume) = 0;
|
||||
virtual bool SetPaused (bool paused) = 0;
|
||||
|
|
|
@ -95,7 +95,7 @@ void FLACSong::Play (bool looping)
|
|||
m_Status = STATE_Stopped;
|
||||
m_Looping = looping;
|
||||
|
||||
if (m_Stream->Play (snd_musicvolume))
|
||||
if (m_Stream->Play (true, snd_musicvolume))
|
||||
{
|
||||
m_Status = STATE_Playing;
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ void TimiditySong::Play (bool looping)
|
|||
{
|
||||
if (m_Stream != NULL)
|
||||
{
|
||||
if (m_Stream->Play (snd_musicvolume))
|
||||
if (m_Stream->Play (true, snd_musicvolume))
|
||||
{
|
||||
m_Status = STATE_Playing;
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ void OPLMUSSong::Play (bool looping)
|
|||
Music->SetLooping (looping);
|
||||
Music->Restart ();
|
||||
|
||||
if (m_Stream->Play (snd_musicvolume))
|
||||
if (m_Stream->Play (true, snd_musicvolume))
|
||||
{
|
||||
m_Status = STATE_Playing;
|
||||
}
|
||||
|
|
|
@ -171,7 +171,7 @@ void SPCSong::Play (bool looping)
|
|||
m_Status = STATE_Stopped;
|
||||
m_Looping = true;
|
||||
|
||||
if (m_Stream->Play (snd_musicvolume))
|
||||
if (m_Stream->Play (true, snd_musicvolume))
|
||||
{
|
||||
m_Status = STATE_Playing;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ void StreamSong::Play (bool looping)
|
|||
m_Status = STATE_Stopped;
|
||||
m_Looping = looping;
|
||||
|
||||
if (m_Stream->Play (snd_musicvolume))
|
||||
if (m_Stream->Play (m_Looping, snd_musicvolume))
|
||||
{
|
||||
m_Status = STATE_Playing;
|
||||
m_LastPos = 0;
|
||||
|
@ -56,7 +56,7 @@ StreamSong::~StreamSong ()
|
|||
|
||||
StreamSong::StreamSong (const char *filename_or_data, int offset, int len)
|
||||
{
|
||||
m_Stream = GSnd->OpenStream (filename_or_data, m_Looping? SoundStream::Loop : 0, offset, len);
|
||||
m_Stream = GSnd->OpenStream (filename_or_data, SoundStream::Loop, offset, len);
|
||||
}
|
||||
|
||||
bool StreamSong::IsPlaying ()
|
||||
|
|
|
@ -20,7 +20,6 @@ ACTOR Fatso 67
|
|||
PainSound "fatso/pain"
|
||||
DeathSound "fatso/death"
|
||||
ActiveSound "fatso/active"
|
||||
AttackSound "fatso/raiseguns"
|
||||
Obituary "$OB_FATSO"
|
||||
States
|
||||
{
|
||||
|
|
|
@ -59,7 +59,7 @@ ACTOR AxeBlood
|
|||
Spawn:
|
||||
FAXE FGHIJ 3
|
||||
Death:
|
||||
FAXE G 3
|
||||
FAXE K 3
|
||||
Stop
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue