zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-24 13:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Thew sounds of Strife's intro need CHAN_UI.

Browse source 
- Changed all instances of playing the chat sounds to use CHAN_UI.


SVN r1085 (trunk)
This commit is contained in:
Christoph Oelckers 2008-07-23 19:39:01 +00:00
parent 48b1514db1
commit 47d8a41540
5 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/rh-log.txt
View file

@ -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 July 21, 2008
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or - Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation. FStrings, depending on the situation.

14
src/d_main.cpp
View file

@ -924,7 +924,7 @@ void D_DoStrifeAdvanceDemo ()
pagetic = 10 * TICRATE/35; pagetic = 10 * TICRATE/35;
pagename = ""; // PANEL0, but strife0.wad doesn't have it, so don't use it. pagename = ""; // PANEL0, but strife0.wad doesn't have it, so don't use it.
PageBlank = true; PageBlank = true;
S_Sound (CHAN_VOICE, "bishop/active", 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, "bishop/active", 1, ATTN_NORM);
break; break;
case 2: case 2:
@ -935,38 +935,38 @@ void D_DoStrifeAdvanceDemo ()
case 3: case 3:
pagetic = 7 * TICRATE; pagetic = 7 * TICRATE;
pagename = "PANEL1"; 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"); S_StartMusic ("d_intro");
break; break;
case 4: case 4:
pagetic = 9 * TICRATE; pagetic = 9 * TICRATE;
pagename = "PANEL2"; pagename = "PANEL2";
S_Sound (CHAN_VOICE, voices[1], 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, voices[1], 1, ATTN_NORM);
break; break;
case 5: case 5:
pagetic = 12 * TICRATE; pagetic = 12 * TICRATE;
pagename = "PANEL3"; pagename = "PANEL3";
S_Sound (CHAN_VOICE, voices[2], 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, voices[2], 1, ATTN_NORM);
break; break;
case 6: case 6:
pagetic = 11 * TICRATE; pagetic = 11 * TICRATE;
pagename = "PANEL4"; pagename = "PANEL4";
S_Sound (CHAN_VOICE, voices[3], 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, voices[3], 1, ATTN_NORM);
break; break;
case 7: case 7:
pagetic = 10 * TICRATE; pagetic = 10 * TICRATE;
pagename = "PANEL5"; pagename = "PANEL5";
S_Sound (CHAN_VOICE, voices[4], 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, voices[4], 1, ATTN_NORM);
break; break;
case 8: case 8:
pagetic = 16 * TICRATE; pagetic = 16 * TICRATE;
pagename = "PANEL6"; pagename = "PANEL6";
S_Sound (CHAN_VOICE, voices[5], 1, ATTN_NORM); S_Sound (CHAN_VOICE | CHAN_UI, voices[5], 1, ATTN_NORM);
break; break;
case 9: case 9:

4
src/d_net.cpp
View file

@ -1962,7 +1962,7 @@ void Net_DoCommand (int type, BYTE **stream, int player)
{ {
Printf (PRINT_CHAT, "%s: %s\n", name, s); 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) else if (players[player].userinfo.team == players[consoleplayer].userinfo.team)
{ // Said only to members of the player's 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); 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; break;

7
src/g_heretic/a_hereticglobal.h
View file

@ -23,11 +23,4 @@ class APhoenixPuff : public AActor
void P_DSparilTeleport (AActor *actor); void P_DSparilTeleport (AActor *actor);
class AStaffPuff : public AActor
{
DECLARE_ACTOR (AStaffPuff, AActor)
public:
void BeginPlay ();
};
#endif //__A_HERETICGLOBAL_H__ #endif //__A_HERETICGLOBAL_H__

2
src/p_conversation.cpp
View file

@ -675,7 +675,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
if (pc->player == &players[consoleplayer]) 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; npc->reactiontime = 2;