libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-02 16:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: unwrap nested if

Browse Source
This commit is contained in:
Roland van Laar 2020-07-29 15:47:10 +02:00
parent 3cae01c410
commit fb3ae1d197
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engines/director/cast.cpp
View File

@ -447,20 +447,19 @@ void Cast::loadCastChildren() {
continue;
// First, handle palettes
if (c->_value->_type != kCastBitmap) {
if (c->_value->_type == kCastPalette) {
PaletteCastMember *member = ((PaletteCastMember *)c->_value);
if (member->_children.size() != 1) {
warning("Cast::loadSpriteChildren(): Expected 1 child for palette cast, got %d", member->_children.size());
continue;
}
if (c->_value->_type == kCastPalette) {
PaletteCastMember *member = ((PaletteCastMember *)c->_value);
if (member->_children.size() == 1) {
member->_palette = g_director->getPalette(member->_children[0].index);
} else {
warning("Cast::loadSpriteChildren(): Expected 1 child for palette cast, got %d", member->_children.size());
}
continue;
}
if (c->_value->_type != kCastBitmap)
continue;
// Then handle bitmaps
BitmapCastMember *bitmapCast = (BitmapCastMember *)c->_value;
uint32 tag = bitmapCast->_tag;