[Scummvm-cvs-logs] scummvm master -> 9dddf76aa79751bf232d5dcd6a85248cf725a723
dreammaster
dreammaster at scummvm.org
Sun Jun 19 13:17:05 CEST 2011
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4de14b0dbc TSAGE: Fixed problem with number of voices not being reset
cc63cbcf5f TSAGE: Cleaned up the write() method
9dddf76aa7 Merge remote branch 'remotes/dreammaster/tsage_sound'
Commit: 4de14b0dbc593db9bbccba9fb28a1ec0f589e56b
https://github.com/scummvm/scummvm/commit/4de14b0dbc593db9bbccba9fb28a1ec0f589e56b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-18T20:30:29-07:00
Commit Message:
TSAGE: Fixed problem with number of voices not being reset
Changed paths:
engines/tsage/sound.cpp
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 79cd08b..5531ad9 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -707,6 +707,9 @@ void SoundManager::_sfRethinkVoiceTypes() {
vse._type1._channelNum2 = 0;
vse._type1._priority2 = 0;
}
+
+ // Reset the number of voices available
+ vs->_numVoices = vs->_total;
}
}
@@ -2058,6 +2061,7 @@ void Sound::_soUpdateDamper(VoiceTypeStruct *voiceType, int channelNum, VoiceTyp
vte._field5 = 0;
driver->updateVoice(voiceType->_entries[idx]._voiceNum);
}
+ return;
}
}
}
@@ -2424,11 +2428,10 @@ void AdlibSoundDriver::close() {
bool AdlibSoundDriver::reset() {
write(1, 0x20);
write(4, 0x80);
-/*
- * code fragment originally part of testing Adlib timer speed
+
write(2, 1);
write(4, 1);
-*/
+
return true;
}
Commit: cc63cbcf5fe466ff72e84d1eeb34f0afd61b5714
https://github.com/scummvm/scummvm/commit/cc63cbcf5fe466ff72e84d1eeb34f0afd61b5714
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-19T03:17:47-07:00
Commit Message:
TSAGE: Cleaned up the write() method
Changed paths:
engines/tsage/sound.cpp
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 5531ad9..4494656 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2512,18 +2512,6 @@ void AdlibSoundDriver::setPitch(int channel, int pitchBlend) {
}
void AdlibSoundDriver::write(byte reg, byte value) {
-static int num = 1;
-/*
- if (((num - 1) % 8) == 0)
- debugN("\n9800:%.4x ", (num - 1) * 2 + 2);
-
- debugN("%.2x %.2x ", reg, value);
- ++num;
-*/
-debugN("%d [%x]=%x ", num++, reg, value);//***DEBUG****
- for (int idx = 0; idx < ADLIB_CHANNEL_COUNT; ++idx) debugN("%d", _channelVoiced[idx] ? 1 : 0);
- debugN("\n");
-
_portContents[reg] = value;
OPLWriteReg(_opl, reg, value);
}
Commit: 9dddf76aa79751bf232d5dcd6a85248cf725a723
https://github.com/scummvm/scummvm/commit/9dddf76aa79751bf232d5dcd6a85248cf725a723
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-19T04:14:49-07:00
Commit Message:
Merge remote branch 'remotes/dreammaster/tsage_sound'
Conflicts:
engines/tsage/ringworld_scenes1.cpp
engines/tsage/ringworld_scenes5.cpp
engines/tsage/tsage.h
Changed paths:
engines/tsage/converse.cpp
engines/tsage/converse.h
engines/tsage/core.cpp
engines/tsage/core.h
engines/tsage/events.cpp
engines/tsage/globals.cpp
engines/tsage/globals.h
engines/tsage/resources.cpp
engines/tsage/ringworld_demo.cpp
engines/tsage/ringworld_demo.h
engines/tsage/ringworld_logic.cpp
engines/tsage/ringworld_scenes1.cpp
engines/tsage/ringworld_scenes1.h
engines/tsage/ringworld_scenes10.cpp
engines/tsage/ringworld_scenes10.h
engines/tsage/ringworld_scenes2.cpp
engines/tsage/ringworld_scenes2.h
engines/tsage/ringworld_scenes3.cpp
engines/tsage/ringworld_scenes3.h
engines/tsage/ringworld_scenes4.cpp
engines/tsage/ringworld_scenes4.h
engines/tsage/ringworld_scenes5.cpp
engines/tsage/ringworld_scenes5.h
engines/tsage/ringworld_scenes6.cpp
engines/tsage/ringworld_scenes6.h
engines/tsage/ringworld_scenes8.cpp
engines/tsage/ringworld_scenes8.h
engines/tsage/sound.cpp
engines/tsage/sound.h
engines/tsage/tsage.cpp
engines/tsage/tsage.h
diff --cc engines/tsage/ringworld_scenes1.cpp
index 6960788,9d261ac..9f8aedb
--- a/engines/tsage/ringworld_scenes1.cpp
+++ b/engines/tsage/ringworld_scenes1.cpp
@@@ -2999,22 -2999,16 +2999,22 @@@ void Scene6100::Action5::dispatch()
if ((idx != 3) && (scene->_fadePercent == 100) &&
(tempSet.sqrt(zeroSet) < 150.0)) {
switch (scene->_hitCount++) {
+ case 0:
- scene->_soundHandler.startSound(233);
++ scene->_soundHandler.play(233);
+ scene->showMessage(NULL, 0, NULL);
+
+ if (!_globals->getFlag(76))
+ scene->_probe.setAction(&scene->_action1);
+ break;
case 1:
- scene->_soundHandler.startSound(233);
+ scene->_soundHandler.play(233);
scene->showMessage(NULL, 0, NULL);
if (!_globals->getFlag(76))
scene->_probe.setAction(&scene->_action2);
break;
-
case 2:
- scene->_soundHandler.startSound(234);
+ scene->_soundHandler.play(234);
scene->showMessage(NULL, 0, NULL);
if (!_globals->getFlag(76))
diff --cc engines/tsage/ringworld_scenes3.cpp
index a19f15e,f1aedc8..5d2732d
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@@ -2557,10 -2544,19 +2557,10 @@@ void Scene2150::postInit(SceneObjectLis
_globals->_sceneItems.addItems(&_hotspot1, &_hotspot2, &_hotspot3, &_hotspot4, &_hotspot5,
&_hotspot6, &_hotspot7, &_hotspot10, &_hotspot9, &_hotspot11, &_hotspot8, NULL);
- _area1.setup(2153, 2, 1, 2100);
- _area1._pt = Common::Point(200, 31);
- _area2.setup(2153, 3, 1, 2150);
- _area2._pt = Common::Point(200, 50);
- _area3.setup(2153, 4, 1, 2320);
- _area3._pt = Common::Point(200, 75);
- _area4.setup(2153, 1, 1, 10);
- _area4._pt = Common::Point(237, 77);
-
switch (_globals->_sceneManager._previousScene) {
case 2120:
- _globals->_soundHandler.startSound(160);
- _globals->_soundHandler.proc5(true);
+ _globals->_soundHandler.play(160);
+ _globals->_soundHandler.holdAt(true);
_globals->_player.setPosition(Common::Point(108, 99));
break;
case 2200:
diff --cc engines/tsage/ringworld_scenes5.cpp
index 8b95e40,cdd0236..c884f9f
--- a/engines/tsage/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld_scenes5.cpp
@@@ -3110,8 -3087,7 +3110,8 @@@ void Scene4150::dispatch()
Scene::dispatch();
if (!_action && (_globals->_player._position.x >= 316)) {
- _globals->_soundHandler.proc1(NULL);
- _soundHandler.proc1(NULL);
+ _globals->_soundHandler.fadeOut(NULL);
++ _soundHandler.fadeOut(NULL);
_globals->_player.disableControl();
_sceneMode = 4152;
setAction(&_sequenceManager, this, 4152, &_globals->_player, NULL);
diff --cc engines/tsage/ringworld_scenes8.cpp
index 934c749,6d8b577..2b329b9
--- a/engines/tsage/ringworld_scenes8.cpp
+++ b/engines/tsage/ringworld_scenes8.cpp
@@@ -1135,12 -1131,12 +1135,12 @@@ void Scene7100::postInit(SceneObjectLis
_object1.setPosition(Common::Point(100, 100));
setAction(&_action11);
- _soundHandler1.startSound(270);
- _soundHandler2.startSound(275);
- _globals->_soundHandler.startSound(270);
+ _soundHandler1.play(270);
+ _soundHandler2.play(275);
+ _globals->_soundHandler.play(270);
}
/*--------------------------------------------------------------------------
- * Scene 7200
+ * Scene 7200 - Underwater: Entering the cave
*
*--------------------------------------------------------------------------*/
diff --cc engines/tsage/tsage.cpp
index 50ce0ce,cb39f66..41f3d58
--- a/engines/tsage/tsage.cpp
+++ b/engines/tsage/tsage.cpp
@@@ -81,9 -81,12 +81,12 @@@ void TSageEngine::initialize()
_globals = new Globals();
_globals->gfxManager().setDefaults();
+
+ // Setup sound settings
+ syncSoundSettings();
}
-void TSageEngine::deinitialise() {
+void TSageEngine::deinitialize() {
delete _globals;
delete _resourceManager;
delete _saver;
diff --cc engines/tsage/tsage.h
index 5db45f2,3138179..f004c7f
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@@ -82,11 -85,12 +84,12 @@@ public
virtual bool canLoadGameStateCurrently();
virtual bool canSaveGameStateCurrently();
virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const char *desc);
+ virtual Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual void syncSoundSettings();
Common::String generateSaveName(int slot);
- void initialise();
- void deinitialise();
+ void initialize();
+ void deinitialize();
};
extern TSageEngine *_vm;
More information about the Scummvm-git-logs
mailing list