[Scummvm-cvs-logs] scummvm master -> 1241efcbcae7ea053067b2a80dcd93e88b4d0cea

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8efcc3cf26 ZVISION: Bugfix for addDir() - fixes the Nemesis subtitle patch
1241efcbca ZVISION: Allow 2x scaling up in videos again


Commit: 8efcc3cf26b80ca0451da4c30113b3610f685467
    https://github.com/scummvm/scummvm/commit/8efcc3cf26b80ca0451da4c30113b3610f685467
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-16T03:46:31+02:00

Commit Message:
ZVISION: Bugfix for addDir() - fixes the Nemesis subtitle patch

Changed paths:
    engines/zvision/file/search_manager.cpp



diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 752b52b..1a6a96e 100644
--- a/engines/zvision/file/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -38,7 +38,10 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 
 	listDirRecursive(_dirList, fsNode, depth);
 
-	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();)
+	for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end();) {
+		if ((*it).hasSuffix("\\") || (*it).hasSuffix("/"))
+			(*it).deleteLastChar();
+
 		if (it->size() == _root.size())
 			it = _dirList.erase(it);
 		else if (it->size() > _root.size()) {
@@ -46,6 +49,7 @@ SearchManager::SearchManager(const Common::String &rootPath, int depth) {
 			it++;
 		} else
 			it++;
+	}
 }
 
 SearchManager::~SearchManager() {


Commit: 1241efcbcae7ea053067b2a80dcd93e88b4d0cea
    https://github.com/scummvm/scummvm/commit/1241efcbcae7ea053067b2a80dcd93e88b4d0cea
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-16T03:47:28+02:00

Commit Message:
ZVISION: Allow 2x scaling up in videos again

This fixes the alchemists and cup sequence in Nemesis

Changed paths:
    engines/zvision/scripting/sidefx/animation_node.cpp



diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp
index e15f8ec..3a21227 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;