thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added voices pack/cd music support

Browse source 
svn-id: r48962
This commit is contained in:
Vladimir Menshakov 2010-05-07 07:56:57 +00:00
parent e4a4df960a
commit 2dd34a2123
5 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/teenagent/console.cpp
View file

@ -31,6 +31,7 @@ Console::Console(TeenAgentEngine *engine) : _engine(engine) {
DCmd_Register("enable_object", WRAP_METHOD(Console, enableObject));
DCmd_Register("disable_object", WRAP_METHOD(Console, enableObject));
DCmd_Register("set_ons", WRAP_METHOD(Console, setOns));
DCmd_Register("set_music", WRAP_METHOD(Console, setMusic));
}
bool Console::enableObject(int argc, const char **argv) {
@ -91,7 +92,20 @@ bool Console::setOns(int argc, const char **argv) {
}
_engine->setOns(index, value, scene_id);
return true;
}
bool Console::setMusic(int argc, const char **argv) {
if (argc < 2) {
DebugPrintf("usage: %s index(1-11)\n", argv[0]);
return true;
}
int index = atoi(argv[1]);
if (index <= 0 || index > 11) {
DebugPrintf("invalid value\n");
return true;
}
_engine->setMusic(index);
return true;
}

1
engines/teenagent/console.h
View file

@ -38,6 +38,7 @@ public:
private:
bool enableObject(int argc, const char **argv);
bool setOns(int argc, const char **argv);
bool setMusic(int argc, const char **argv);
TeenAgentEngine *_engine;
};

3
engines/teenagent/resources.cpp
View file

@ -44,6 +44,7 @@ void Resources::deinit() {
mmm.close();
sam_mmm.close();
sam_sam.close();
voices.close();
}
/*
@ -95,7 +96,7 @@ bool Resources::loadArchives(const ADGameDescription *gd) {
mmm.open("mmm.res");
sam_mmm.open("sam_mmm.res");
sam_sam.open("sam_sam.res");
voices.open("voices.res");
return true;
}

4
engines/teenagent/resources.h
View file

@ -54,9 +54,9 @@ public:
* TransientFilePack does not keep opened file descriptors and reopens it on each request.
*/
#ifdef __PSP__
TransientFilePack off, on, ons, lan000, lan500, sam_mmm, sam_sam, mmm;
TransientFilePack off, on, ons, lan000, lan500, sam_mmm, sam_sam, mmm, voices;
#else
FilePack off, on, ons, lan000, lan500, sam_mmm, sam_sam, mmm;
FilePack off, on, ons, lan000, lan500, sam_mmm, sam_sam, mmm, voices;
#endif
Segment cseg, dseg, eseg;

19
engines/teenagent/teenagent.cpp
View file

@ -31,6 +31,7 @@
#include "engines/advancedDetector.h"
#include "engines/util.h"
#include "sound/audiocd.h"
#include "sound/mixer.h"
#include "sound/decoders/raw.h"
@ -470,8 +471,8 @@ Common::Error TeenAgentEngine::run() {
syncSoundSettings();
music->load(1);
_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
setMusic(1);
music->start();
int load_slot = Common::ConfigManager::instance().getInt("save_slot");
@ -971,9 +972,21 @@ void TeenAgentEngine::playSoundNow(byte id) {
void TeenAgentEngine::setMusic(byte id) {
debug(0, "starting music %u", id);
if (!music->load(id))
Resources *res = Resources::instance();
if (id != 1) //intro music
*res->dseg.ptr(0xDB90) = id;
if (_gameDescription->flags & ADGF_CD) {
byte track2cd[] = {7, 2, 0, 9, 3, 6, 8, 10, 4, 5, 11};
if (id == 0 || id > 11 || track2cd[id - 1] == 0) {
debug(0, "no cd music for id %u", id);
return;
*Resources::instance()->dseg.ptr(0xDB90) = id;
}
byte track = track2cd[id - 1];
debug(0, "playing cd track %u", track);
Audio::AudioCDManager::instance().play(track, -1, 0, 0);
} else if (music->load(id))
music->start();
}