[Scummvm-cvs-logs] CVS: scummvm/bs2 credits.h,1.1,1.2 sound.cpp,1.10,1.11 sword2.cpp,1.21,1.22

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv19828

Modified Files:
	credits.h sound.cpp sword2.cpp 
Log Message:
added sfx support, increased speech support, and music code(streaming works fine but you don't hear anything) newStream, and appendStream doesn't work but playRaw works for music

Index: credits.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/credits.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- credits.h	28 Jul 2003 01:44:37 -0000	1.1
+++ credits.h	30 Aug 2003 18:06:07 -0000	1.2
@@ -23,6 +23,6 @@
 #include "driver/driver96.h"
 
 // int32 __declspec( dllexport ) Credits(_drvDrawStatus *pDrawStatus, _drvSoundStatus *pSoundStatus, const char *cdPath, BOOL smoke, BOOL *pAppFocus, _drvKeyStatus *pKeyStatus);
-int32 Credits(_drvDrawStatus *pDrawStatus, _drvSoundStatus *pSoundStatus, const char *cdPath, BOOL smoke, BOOL *pAppFocus, _drvKeyStatus *pKeyStatus);
+//int32 Credits(_drvDrawStatus *pDrawStatus, _drvSoundStatus *pSoundStatus, const char *cdPath, BOOL smoke, BOOL *pAppFocus, _drvKeyStatus *pKeyStatus);
 
 #endif

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp	24 Aug 2003 12:13:03 -0000	1.10
+++ sound.cpp	30 Aug 2003 18:06:07 -0000	1.11
@@ -412,7 +412,7 @@
 
 	sprintf(filename,"Music.clu");
 
-	rv = g_sword2->_sound->StreamCompMusic(filename, g_sword2->getGameDataPath(), params[0], loopFlag);
+	rv = g_sword2->_sound->StreamCompMusic(filename, params[0], loopFlag);
 
 	#ifdef _SWORD2_DEBUG
 		if (rv)

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sword2.cpp	29 Aug 2003 06:19:34 -0000	1.21
+++ sword2.cpp	30 Aug 2003 18:06:07 -0000	1.22
@@ -18,15 +18,12 @@
  */
 
 //------------------------------------------------------------------------------------
-#include <ctype.h>
-#include <stdio.h>
-//#include <windows.h>
-
 #include "stdafx.h"
 #include "driver/driver96.h"
 #include "driver/palette.h"
 #include "common/gameDetector.h"
 #include "common/config-file.h"
+#include "common/timer.h"
 #include "build_display.h"
 #include "console.h"
 #include "controls.h"
@@ -318,6 +315,7 @@
 	}
 */
 
+	g_engine->_timer->installProcedure(sword2_sound_handler, 1000000);
 	Zdebug("CALLING: InitialiseGame");
 	if (InitialiseGame())
 	{