aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2014-12-16 03:47:28 +0200
committerFilippos Karapetis2014-12-16 03:47:28 +0200
commit1241efcbcae7ea053067b2a80dcd93e88b4d0cea (patch)
tree53588ca0178290939002d45360c28357b8ec438f
parent8efcc3cf26b80ca0451da4c30113b3610f685467 (diff)
downloadscummvm-rg350-1241efcbcae7ea053067b2a80dcd93e88b4d0cea.tar.gz
scummvm-rg350-1241efcbcae7ea053067b2a80dcd93e88b4d0cea.tar.bz2
scummvm-rg350-1241efcbcae7ea053067b2a80dcd93e88b4d0cea.zip
ZVISION: Allow 2x scaling up in videos again
This fixes the alchemists and cup sequence in Nemesis
-rw-r--r--engines/zvision/scripting/sidefx/animation_node.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index e15f8ec00f..3a21227d1a 100644
--- a/engines/zvision/scripting/sidefx/animation_node.cpp
+++ b/engines/zvision/scripting/sidefx/animation_node.cpp
@@ -120,8 +120,10 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
// We only scale down the animation to fit its frame, not up, otherwise we
// end up with distorted animations - e.g. the armor visor in location cz1e
// in Nemesis (one of the armors inside Irondune), or the planet in location
- // aa10 in Nemesis (Juperon, outside the asylum).
- if (frame->w > dstw || frame->h > dsth) {
+ // aa10 in Nemesis (Juperon, outside the asylum). We do allow scaling up only
+ // when a simple 2x filter is requested (e.g. the alchemists and cup sequence
+ // in Nemesis)
+ if (frame->w > dstw || frame->h > dsth || (frame->w == dstw / 2 && frame->h == dsth / 2)) {
if (nod->_scaled)
if (nod->_scaled->w != dstw || nod->_scaled->h != dsth) {
delete nod->_scaled;