diff options
author | Nicola Mettifogo | 2007-11-01 17:39:58 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-11-01 17:39:58 +0000 |
commit | 555336cebeffb7a3796c08880ed037d2d86ee968 (patch) | |
tree | f9693e6ab4c78a71f243d5e816336c2244bd2a05 /engines/parallaction/parallaction.cpp | |
parent | 60c6720441ae107b93a92e1e691f0a31a95e40c3 (diff) | |
download | scummvm-rg350-555336cebeffb7a3796c08880ed037d2d86ee968.tar.gz scummvm-rg350-555336cebeffb7a3796c08880ed037d2d86ee968.tar.bz2 scummvm-rg350-555336cebeffb7a3796c08880ed037d2d86ee968.zip |
Fix for bug #1822819. Donna now changes her look into Suzy after makeup.
svn-id: r29361
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r-- | engines/parallaction/parallaction.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index e7223d2386..126e16c77b 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -1084,15 +1084,20 @@ void Character::setName(const char *name) { const char *end = begin + strlen(name); _prefix = _empty; - _suffix = _empty; _dummy = IS_DUMMY_CHARACTER(name); if (!_dummy) { - const char *s = strstr(name, "tras"); - if (s) { + if (_engineFlags & kEngineTransformedDonna) { _suffix = _suffixTras; - end = s; + } else { + const char *s = strstr(name, "tras"); + if (s) { + _suffix = _suffixTras; + end = s; + } else { + _suffix = _empty; + } } if (IS_MINI_CHARACTER(name)) { _prefix = _prefixMini; @@ -1106,21 +1111,6 @@ void Character::setName(const char *name) { sprintf(_fullName, "%s%s%s", _prefix, _baseName, _suffix); } -void Character::transform() { - if (scumm_stricmp("donna", _baseName)) { - error("can't transform character %s", _baseName); - } - - if (_suffix) { - _suffix = _empty; - } else { - _suffix = _suffixTras; - } - - _engineFlags ^= kEngineTransformedDonna; - setName(_name); -} - const char *Character::getName() const { return _name; } |