[Scummvm-cvs-logs] CVS: scummvm/bs2 sword2.cpp,1.23,1.24
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 2 08:56:16 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv14118
Modified Files:
sword2.cpp
Log Message:
Moved the sound initialisation to the Sword2Sound constructor to avoid
warning messages about uninitialised sound handles.
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/sword2.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sword2.cpp 30 Aug 2003 21:58:10 -0000 1.23
+++ sword2.cpp 2 Sep 2003 15:55:54 -0000 1.24
@@ -23,7 +23,6 @@
#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"
@@ -300,23 +299,6 @@
Zdebug("CALLING: ReadOptionSettings");
ReadOptionSettings(); //restore the menu settings
Zdebug("RETURNED.");
-
- Zdebug("CALLING: InitialiseSound");
- rv = _sound->InitialiseSound(22050, 2, 16);
- Zdebug("RETURNED with rv = %.8x", rv);
- // don't care if this fails, because it should still work without sound cards
- // but it should set a global system flag so that we can avoid loading sound fx & streaming music
- // because they won't be heard anyway
-/*
- if (rv != RD_OK)
- {
- ReportDriverError(rv);
- CloseAppWindow();
- return(0);
- }
-*/
-
- g_engine->_timer->installProcedure(sword2_sound_handler, 1000000);
Zdebug("CALLING: InitialiseGame");
if (InitialiseGame())
{
More information about the Scummvm-git-logs
mailing list