aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2008-08-15 03:36:01 +0000
committerNicola Mettifogo2008-08-15 03:36:01 +0000
commit2679f6ce7ae1d3810187f8472d9cf8fe2368d83c (patch)
treec722aa22015ad78491580db99e644da086ec5ddb
parentea2a2cbb7c3a0d8721f1968414bd421a43b13596 (diff)
downloadscummvm-rg350-2679f6ce7ae1d3810187f8472d9cf8fe2368d83c.tar.gz
scummvm-rg350-2679f6ce7ae1d3810187f8472d9cf8fe2368d83c.tar.bz2
scummvm-rg350-2679f6ce7ae1d3810187f8472d9cf8fe2368d83c.zip
Disabled lip syncing code in BRA, since I couldn't find any scripts actually using it. Some warnings have been added as a sentinel.
svn-id: r33890
-rw-r--r--engines/parallaction/callables_br.cpp2
-rw-r--r--engines/parallaction/exec_br.cpp3
-rw-r--r--engines/parallaction/parallaction.h2
-rw-r--r--engines/parallaction/parser_br.cpp3
4 files changed, 8 insertions, 2 deletions
diff --git a/engines/parallaction/callables_br.cpp b/engines/parallaction/callables_br.cpp
index 628ba0c1f1..a4aec8e93e 100644
--- a/engines/parallaction/callables_br.cpp
+++ b/engines/parallaction/callables_br.cpp
@@ -41,7 +41,7 @@ void Parallaction_br::_c_ferrcycle(void*) {
}
void Parallaction_br::_c_lipsinc(void*) {
- warning("Parallaction_br::_c_lipsinc() not yet implemented");
+ warning("Unexpected lipsinc routine call! Please notify the team!");
}
void Parallaction_br::_c_albcycle(void*) {
diff --git a/engines/parallaction/exec_br.cpp b/engines/parallaction/exec_br.cpp
index e58ec13d98..fe7b1b2903 100644
--- a/engines/parallaction/exec_br.cpp
+++ b/engines/parallaction/exec_br.cpp
@@ -97,8 +97,9 @@ void Parallaction_br::setupSubtitles(char *s, char *s2, int y) {
} else {
_subtitle[1] = -1;
}
-
+#if 0 // disabled because no references to lip sync has been found in the scripts
_subtitleLipSync = 0;
+#endif
}
void Parallaction_br::clearSubtitles() {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 06adf8fa16..fb004a25b7 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -625,8 +625,10 @@ public:
int _part;
int _progress;
+#if 0 // disabled since I couldn't find any references to lip sync in the scripts
int16 _lipSyncVal;
uint _subtitleLipSync;
+#endif
int _subtitleY;
int _subtitle[2];
diff --git a/engines/parallaction/parser_br.cpp b/engines/parallaction/parser_br.cpp
index b71ac44d3c..b68401a88b 100644
--- a/engines/parallaction/parser_br.cpp
+++ b/engines/parallaction/parser_br.cpp
@@ -1009,7 +1009,10 @@ void ProgramParser_br::parseRValue(ScriptVar &v, const char *str) {
v.setRandom(atoi(&str[1]));
} else
if (str[0] == 'L') {
+#if 0 // disabled because no references to lip sync has been found in the scripts
v.setField(&_vm->_lipSyncVal);
+#endif
+ warning("Lip sync instruction encountered! Please notify the team!");
}
}