aboutsummaryrefslogtreecommitdiff
path: root/engines/zvision/scripting/sidefx
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-26 22:30:32 +0200
committerFilippos Karapetis2014-12-26 22:30:32 +0200
commitdb37cfb1b04fb6d1fb21ef3bd3c0b90128bf4d89 (patch)
tree639cf97f07de5bc1a3b35b76ebf0aedbab455079 /engines/zvision/scripting/sidefx
parent2becc76d5c16d15d5a7a6733b40f7c59e7391c12 (diff)
downloadscummvm-rg350-db37cfb1b04fb6d1fb21ef3bd3c0b90128bf4d89.tar.gz
scummvm-rg350-db37cfb1b04fb6d1fb21ef3bd3c0b90128bf4d89.tar.bz2
scummvm-rg350-db37cfb1b04fb6d1fb21ef3bd3c0b90128bf4d89.zip
ZVISION: Remove duplicate blitting code for images and animations
Diffstat (limited to 'engines/zvision/scripting/sidefx')
-rw-r--r--engines/zvision/scripting/sidefx/animation_node.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index b966aa9cb8..7759758f56 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -154,17 +154,11 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
if (_engine->getRenderManager()->getRenderTable()->getRenderState() == RenderTable::PANORAMA) {
Graphics::Surface *transposed = RenderManager::tranposeSurface(frame);
- if (_mask > 0)
- _engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
- else
- _engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top);
+ _engine->getRenderManager()->blitSurfaceToBkg(*transposed, nod->pos.left, nod->pos.top, _mask);
transposed->free();
delete transposed;
} else {
- if (_mask > 0)
- _engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
- else
- _engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top);
+ _engine->getRenderManager()->blitSurfaceToBkg(*frame, nod->pos.left, nod->pos.top, _mask);
}
}
}