aboutsummaryrefslogtreecommitdiff
path: root/sound.cpp
diff options
context:
space:
mode:
authorLudvig Strigeus2001-11-26 19:57:57 +0000
committerLudvig Strigeus2001-11-26 19:57:57 +0000
commit38e2a886ce152ed2b0cfe9777a0514a10c56de04 (patch)
treeb208fd89d2050005c2e79851f6101c6a94860a7a /sound.cpp
parent7b959f62677cf18f52d53123a4d8eb819d01a828 (diff)
downloadscummvm-rg350-38e2a886ce152ed2b0cfe9777a0514a10c56de04.tar.gz
scummvm-rg350-38e2a886ce152ed2b0cfe9777a0514a10c56de04.tar.bz2
scummvm-rg350-38e2a886ce152ed2b0cfe9777a0514a10c56de04.zip
very simple full throttle support, use the FULL_THROTTLE define. (will fix later)
modified some actor parts to work better with full throttle (most likely new bugs because of that). directions are now stored as angles instead of left/right/up/down implemented loadFlObject (flobjects are currently saved in the savestate, will fix that also) svn-id: r3505
Diffstat (limited to 'sound.cpp')
-rw-r--r--sound.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound.cpp b/sound.cpp
index 4c2cf92564..533c275b44 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -24,9 +24,11 @@
#include "sound.h"
void Scumm::addSoundToQueue(int sound) {
+#if !defined(FULL_THROTTLE)
_vars[VAR_LAST_SOUND] = sound;
ensureResourceLoaded(rtSound, sound);
addSoundToQueue2(sound);
+#endif
}
void Scumm::addSoundToQueue2(int sound) {
@@ -77,8 +79,10 @@ void Scumm::processSoundQues() {
data[7]
);
#endif
+#if !defined(FULL_THROTTLE)
if (se)
_vars[VAR_SOUNDRESULT] = se->do_command(data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]);
+#endif
}
}
_soundQuePos = 0;
@@ -114,7 +118,7 @@ void Scumm::processSfxQueues() {
b = isMouthSyncOff(_curSoundPos);
if (_mouthSyncMode != b) {
_mouthSyncMode = b;
- startAnimActor(a, b ? a->talkFrame2 : a->talkFrame1, a->facing);
+ startAnimActor(a, b ? a->talkFrame2 : a->talkFrame1);
}
}
}
@@ -134,6 +138,8 @@ void Scumm::startTalkSound(uint32 offset, uint32 b, int mode) {
byte file_byte,file_byte_2;
uint16 elem;
+ return;
+
if (!_sfxFile) {
warning("startTalkSound: SFX file is not open");
return;