aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-10-30 19:41:55 +0000
committerNicola Mettifogo2007-10-30 19:41:55 +0000
commitecbd31160e99cf7ee5e49fd2eddf510dd57f94e6 (patch)
treefd5004ebe4ab25608cf87d953da81b222e512ec6 /engines/parallaction/parallaction.cpp
parentea644a036b1db25436ae088d8e83352d30b9ade7 (diff)
downloadscummvm-rg350-ecbd31160e99cf7ee5e49fd2eddf510dd57f94e6.tar.gz
scummvm-rg350-ecbd31160e99cf7ee5e49fd2eddf510dd57f94e6.tar.bz2
scummvm-rg350-ecbd31160e99cf7ee5e49fd2eddf510dd57f94e6.zip
Fix for bug #1822680.
svn-id: r29326
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 57d98e2a33..bc41f9f341 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -1015,6 +1015,8 @@ Character::Character(Parallaction *vm) : _vm(vm), _builder(&_ani) {
_head = NULL;
_objs = NULL;
+ _dummy = false;
+
_ani._left = 150;
_ani._top = 100;
_ani._z = 10;
@@ -1086,22 +1088,18 @@ void Character::setName(const char *name) {
_prefix = _empty;
_suffix = _empty;
- if (IS_DUMMY_CHARACTER(name)) {
- begin = 0;
- end = 0;
- } else {
+ _dummy = IS_DUMMY_CHARACTER(name);
+ if (!_dummy) {
const char *s = strstr(name, "tras");
if (s) {
_suffix = _suffixTras;
end = s;
}
-
if (IS_MINI_CHARACTER(name)) {
_prefix = _prefixMini;
begin = name+4;
}
-
}
memset(_baseName, 0, 30);
@@ -1137,6 +1135,9 @@ const char *Character::getFullName() const {
return _fullName;
}
+bool Character::dummy() const {
+ return _dummy;
+}
void Parallaction::beep() {
_soundMan->playSfx("beep", 3, false);