[Scummvm-cvs-logs] SF.net SVN: scummvm:[33145] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Jul 20 20:00:00 CEST 2008
Revision: 33145
http://scummvm.svn.sourceforge.net/scummvm/?rev=33145&view=rev
Author: athrxx
Date: 2008-07-20 18:00:00 +0000 (Sun, 20 Jul 2008)
Log Message:
-----------
KYRA: disable incomplete PC-98 audio support for 0.12.0 release (use towns audio instead)
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2008-07-20 17:58:14 UTC (rev 33144)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2008-07-20 18:00:00 UTC (rev 33145)
@@ -114,7 +114,7 @@
_sound = new SoundTownsPC98_v2(this, _mixer);
} else if (_flags.platform == Common::kPlatformPC98) {
if (_flags.gameID == GI_KYRA1)
- _sound = new SoundPC98(this, _mixer);
+ _sound = new SoundTowns/*SoundPC98*/(this, _mixer);
else
_sound = new SoundTownsPC98_v2(this, _mixer);
} else if (midiDriver == MD_ADLIB) {
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2008-07-20 17:58:14 UTC (rev 33144)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2008-07-20 18:00:00 UTC (rev 33145)
@@ -2363,7 +2363,7 @@
_numSSG(type == OD_TOWNS ? 0 : 3), _hasADPCM(type == OD_TYPE86 ? true : false),
_numChan(type == OD_TYPE26 ? 3 : 6), _hasStereo(type == OD_TYPE26 ? false : true) {
setTempo(84);
- _baserate = (3579545.0 / (double)getRate()) / 144.0;
+ _baserate = (double)getRate() / 10368.0;
}
TownsPC98_OpnDriver::~TownsPC98_OpnDriver() {
@@ -3095,8 +3095,8 @@
}
bool SoundTownsPC98_v2::init() {
- _driver = new TownsPC98_OpnDriver(_mixer, _vm->gameFlags().platform == Common::kPlatformPC98 ?
- TownsPC98_OpnDriver::OD_TYPE86 : TownsPC98_OpnDriver::OD_TOWNS);
+ _driver = new TownsPC98_OpnDriver(_mixer, /*_vm->gameFlags().platform == Common::kPlatformPC98 ?
+ TownsPC98_OpnDriver::OD_TYPE86 :*/ TownsPC98_OpnDriver::OD_TOWNS);
_useFmSfx = _vm->gameFlags().platform == Common::kPlatformPC98 ? true : false;
_vm->checkCD();
// FIXME: While checking for 'track1.XXX(X)' looks like
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2008-07-20 17:58:14 UTC (rev 33144)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2008-07-20 18:00:00 UTC (rev 33145)
@@ -1060,7 +1060,7 @@
else if (_flags.platform == Common::kPlatformFMTowns)
_soundData = soundData_TOWNS;
else if (_flags.platform == Common::kPlatformPC98)
- _soundData = soundData_PC98;
+ _soundData = soundData_TOWNS/*soundData_PC98*/;
}
@@ -1286,7 +1286,7 @@
else if (_flags.platform == Common::kPlatformFMTowns)
_soundData = soundData_TOWNS;
else if (_flags.platform == Common::kPlatformPC98)
- _soundData = soundData_PC98;
+ _soundData = soundData_TOWNS/*soundData_PC98*/;
// setup sequence data
_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list