aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorNicola Mettifogo2007-03-10 21:25:18 +0000
committerNicola Mettifogo2007-03-10 21:25:18 +0000
commit84a5f0f8279598ae326e4f92090afde1bd830938 (patch)
tree10e4f85d214bd8f5a067d5f599527890a68b087d /engines
parentc80c3e3b3bb3f8ffcb03f1d355928aaca254465e (diff)
downloadscummvm-rg350-84a5f0f8279598ae326e4f92090afde1bd830938.tar.gz
scummvm-rg350-84a5f0f8279598ae326e4f92090afde1bd830938.tar.bz2
scummvm-rg350-84a5f0f8279598ae326e4f92090afde1bd830938.zip
fixed regression: head and talks are now loaded only for real characters, i.e. no dummies used for slide transitions
svn-id: r26069
Diffstat (limited to 'engines')
-rw-r--r--engines/parallaction/disk.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index 9f98e0b786..5b37bb9345 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -180,6 +180,11 @@ void Disk::loadTalk(const char *name, Cnv *cnv) {
} else {
// character talk
+ if (scumm_stricmp(name, "dough") &&
+ scumm_stricmp(name, "dino") &&
+ scumm_stricmp(name, "donna") &&
+ scumm_stricmp(name, "drki")) return;
+
char v20[PATH_LEN];
char *v24 = const_cast<char*>(name);
if (!scumm_strnicmp(v24, "mini", 4)) {
@@ -253,6 +258,11 @@ void Disk::loadHead(const char* name, StaticCnv* cnv) {
char path[PATH_LEN];
+ if (scumm_stricmp(name, "dough") &&
+ scumm_stricmp(name, "dino") &&
+ scumm_stricmp(name, "donna") &&
+ scumm_stricmp(name, "drki")) return;
+
if (!scumm_strnicmp(name, "mini", 4)) {
name += 4;
}