From c6b82e7753f24a3ea03596204f62975666aa2239 Mon Sep 17 00:00:00 2001
From: richiesams
Date: Sun, 11 Aug 2013 13:39:52 -0500
Subject: ZVISION: Fix parsed arguments in ActionStreamVideo

---
 engines/zvision/actions.cpp | 5 +++--
 engines/zvision/actions.h   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 4fe77c19ce..2316530c67 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -259,7 +259,7 @@ ActionStreamVideo::ActionStreamVideo(const Common::String &line) {
 	char fileName[25];
 	uint skippable;
 
-	sscanf(line.c_str(), "%*[^(](%25s %u %u %u %u %u %u)", fileName, &_x, &_y, &_width, &_height, &_flags, &skippable);
+	sscanf(line.c_str(), "%*[^(](%25s %u %u %u %u %u %u)", fileName, &_x1, &_y1, &_x2, &_y2, &_flags, &skippable);
 
 	_fileName = Common::String(fileName);
 	_skippable = (skippable == 0) ? false : true;
@@ -272,8 +272,9 @@ bool ActionStreamVideo::execute(ZVision *engine) {
 	}
 
 	Common::Rect destRect;
+	// 0x1 flags that the destRect dimensions are different from the original video dimensions
 	if ((_flags & 0x1) == 0x1) {
-		destRect = Common::Rect(_x, _y, _x + _width, _y + _height);
+		destRect = Common::Rect(_x1, _y1, _x2, _y2);
 	}
 
 	engine->playVideo(decoder, destRect, _skippable);
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index bb446171fe..8e00cb5e53 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -293,10 +293,10 @@ public:
 
 private:
 	Common::String _fileName;
-	uint _x;
-	uint _y;
-	uint _width;
-	uint _height;
+	uint _x1;
+	uint _y1;
+	uint _x2;
+	uint _y2;
 	uint _flags;
 	bool _skippable;
 };
-- 
cgit v1.2.3