summaryrefslogtreecommitdiff
path: root/src/strife/p_dialog.c
diff options
context:
space:
mode:
authorJames Haley2010-09-11 21:12:06 +0000
committerJames Haley2010-09-11 21:12:06 +0000
commit90c196e4eb1d079fa946e764ed72a9ecd2c86dac (patch)
treeeccef190c9caa7ce4d6ff5e585286749c1432bb8 /src/strife/p_dialog.c
parentb6938d1533d624a5815660c40aeda9125090f55e (diff)
downloadchocolate-doom-90c196e4eb1d079fa946e764ed72a9ecd2c86dac.tar.gz
chocolate-doom-90c196e4eb1d079fa946e764ed72a9ecd2c86dac.tar.bz2
chocolate-doom-90c196e4eb1d079fa946e764ed72a9ecd2c86dac.zip
Added code (some possibly temporary?) to load voices.wad. Fixed several
problems with playing of voice sounds - especially had to add a dynamic hashtable of voice sfxinfo_t's because Choco won't tolerate overwriting them once they've been used (see channel_playing array in i_sdlsound.c) - PROBLEM: Random Z_Malloc failures when trying to play sounds. Cannot catch in debugger so far. Subversion-branch: /branches/strife-branch Subversion-revision: 2065
Diffstat (limited to 'src/strife/p_dialog.c')
-rw-r--r--src/strife/p_dialog.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index 8e4b1bc1..bd32ee33 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -1151,7 +1151,8 @@ void P_DialogDoChoice(int choice)
currentchoice = &(currentdialog->choices[choice]);
- // I_StartVoice(0); -- verify (should stop previous voice I believe)
+ I_StartVoice(NULL); // STRIFE-TODO: verify (should stop previous voice I believe)
+
// villsa 09/08/10: converted into for loop
for(i = 0; i < MDLG_MAXITEMS; i++)
{
@@ -1364,7 +1365,7 @@ void P_DialogStart(player_t *player)
V_DrawPatchDirect(0, 0, W_CacheLumpNum(pic, PU_CACHE));
// get voice
- //I_StartVoice(currentdialog->voice);
+ I_StartVoice(currentdialog->voice);
// get bye text
switch(rnd)