libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug #1822680.

Browse Source 
svn-id: r29326
This commit is contained in:
Nicola Mettifogo 2007-10-30 19:41:55 +00:00
parent ea644a036b
commit ecbd31160e
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/parallaction/parallaction.cpp
View File

@ -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);

3
engines/parallaction/parallaction.h
View File

@ -231,6 +231,8 @@ protected:
const char *_prefix;
const char *_suffix;
bool _dummy;
char _name[30];
char _baseName[30];
char _fullName[30];
@ -244,6 +246,7 @@ public:
const char *getName() const;
const char *getBaseName() const;
const char *getFullName() const;
bool dummy() const;
};

2
engines/parallaction/parallaction_ns.cpp
View File

@ -364,7 +364,7 @@ void Parallaction_ns::changeCharacter(const char *name) {
Common::String oldArchive = _disk->selectArchive((getFeatures() & GF_LANG_MULT) ? "disk1" : "disk0");
_char._ani._cnv = _disk->loadFrames(_char.getFullName());
if (_char.getBaseName()[0] != '\0') {
if (!_char.dummy()) {
if (getPlatform() == Common::kPlatformAmiga && (getFeatures() & GF_LANG_MULT))
_disk->selectArchive("disk0");