OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

SVN r44 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2006-04-14 12:58:52 +00:00
commit 07f35a7008
22 changed files with 423 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_conversation.cpp
View file

@ -15,6 +15,7 @@
#include "a_strifeglobal.h"
#include "a_keys.h"
#include "p_enemy.h"
#include "sound/i_music.h"
// The conversations as they exist inside a SCRIPTxx lump.
struct Response
@ -664,6 +665,12 @@ static void TakeStrifeItem (const TypeInfo *itemtype, int amount)
}
}
CUSTOM_CVAR(Float, dlg_musicvolume, 1.0f, CVAR_ARCHIVE)
{
if (self < 0.f) self = 0.f;
else if (self > 1.f) self = 1.f;
}
//============================================================================
//
// P_StartConversation
@ -723,6 +730,7 @@ void P_StartConversation (AActor *npc, AActor *pc)
if (CurNode->SpeakerVoice != 0)
{
I_SetMusicVolume(dlg_musicvolume);
S_SoundID (npc, CHAN_VOICE, CurNode->SpeakerVoice, 1, ATTN_NORM);
}
@ -1043,6 +1051,7 @@ static void PickConversationReply ()
}
ConversationNPC->angle = ConversationNPCAngle;
I_SetMusicVolume(1.f);
}
//============================================================================
@ -1075,5 +1084,6 @@ void CleanupConversationMenu ()
DialogueLines = NULL;
}
ConversationItems.Clear ();
I_SetMusicVolume(1.f);
}