From 90c196e4eb1d079fa946e764ed72a9ecd2c86dac Mon Sep 17 00:00:00 2001 From: James Haley Date: Sat, 11 Sep 2010 21:12:06 +0000 Subject: 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 --- src/strife/p_dialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/strife/p_dialog.c') 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) -- cgit v1.2.3