mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 20:21:26 +00:00
- Fixed: Thew sounds of Strife's intro need CHAN_UI.
- Changed all instances of playing the chat sounds to use CHAN_UI. SVN r1085 (trunk)
This commit is contained in:
parent
48b1514db1
commit
47d8a41540
5 changed files with 14 additions and 17 deletions
|
@ -1,3 +1,7 @@
|
|||
July 23, 2008 (Changes by Graf Zahl)
|
||||
- Fixed: Thew sounds of Strife's intro need CHAN_UI.
|
||||
- Changed all instances of playing the chat sounds to use CHAN_UI.
|
||||
|
||||
July 21, 2008
|
||||
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
|
||||
FStrings, depending on the situation.
|
||||
|
|
|
@ -924,7 +924,7 @@ void D_DoStrifeAdvanceDemo ()
|
|||
pagetic = 10 * TICRATE/35;
|
||||
pagename = ""; // PANEL0, but strife0.wad doesn't have it, so don't use it.
|
||||
PageBlank = true;
|
||||
S_Sound (CHAN_VOICE, "bishop/active", 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, "bishop/active", 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
|
@ -935,38 +935,38 @@ void D_DoStrifeAdvanceDemo ()
|
|||
case 3:
|
||||
pagetic = 7 * TICRATE;
|
||||
pagename = "PANEL1";
|
||||
S_Sound (CHAN_VOICE, voices[0], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[0], 1, ATTN_NORM);
|
||||
S_StartMusic ("d_intro");
|
||||
break;
|
||||
|
||||
case 4:
|
||||
pagetic = 9 * TICRATE;
|
||||
pagename = "PANEL2";
|
||||
S_Sound (CHAN_VOICE, voices[1], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[1], 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 5:
|
||||
pagetic = 12 * TICRATE;
|
||||
pagename = "PANEL3";
|
||||
S_Sound (CHAN_VOICE, voices[2], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[2], 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 6:
|
||||
pagetic = 11 * TICRATE;
|
||||
pagename = "PANEL4";
|
||||
S_Sound (CHAN_VOICE, voices[3], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[3], 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 7:
|
||||
pagetic = 10 * TICRATE;
|
||||
pagename = "PANEL5";
|
||||
S_Sound (CHAN_VOICE, voices[4], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[4], 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 8:
|
||||
pagetic = 16 * TICRATE;
|
||||
pagename = "PANEL6";
|
||||
S_Sound (CHAN_VOICE, voices[5], 1, ATTN_NORM);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, voices[5], 1, ATTN_NORM);
|
||||
break;
|
||||
|
||||
case 9:
|
||||
|
|
|
@ -1962,7 +1962,7 @@ void Net_DoCommand (int type, BYTE **stream, int player)
|
|||
{
|
||||
Printf (PRINT_CHAT, "%s: %s\n", name, s);
|
||||
}
|
||||
S_Sound (CHAN_VOICE, gameinfo.chatSound, 1, ATTN_NONE);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, gameinfo.chatSound, 1, ATTN_NONE);
|
||||
}
|
||||
else if (players[player].userinfo.team == players[consoleplayer].userinfo.team)
|
||||
{ // Said only to members of the player's team
|
||||
|
@ -1974,7 +1974,7 @@ void Net_DoCommand (int type, BYTE **stream, int player)
|
|||
{
|
||||
Printf (PRINT_TEAMCHAT, "(%s): %s\n", name, s);
|
||||
}
|
||||
S_Sound (CHAN_VOICE, gameinfo.chatSound, 1, ATTN_NONE);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, gameinfo.chatSound, 1, ATTN_NONE);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -23,11 +23,4 @@ class APhoenixPuff : public AActor
|
|||
|
||||
void P_DSparilTeleport (AActor *actor);
|
||||
|
||||
class AStaffPuff : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AStaffPuff, AActor)
|
||||
public:
|
||||
void BeginPlay ();
|
||||
};
|
||||
|
||||
#endif //__A_HERETICGLOBAL_H__
|
||||
|
|
|
@ -675,7 +675,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
|
|||
|
||||
if (pc->player == &players[consoleplayer])
|
||||
{
|
||||
S_Sound (CHAN_VOICE, "misc/chat", 1, ATTN_NONE);
|
||||
S_Sound (CHAN_VOICE | CHAN_UI, gameinfo.chatSound, 1, ATTN_NONE);
|
||||
}
|
||||
|
||||
npc->reactiontime = 2;
|
||||
|
|
Loading…
Reference in a new issue