[Scummvm-cvs-logs] scummvm master -> ddff83a87ebf258a5e9832958714133098677459

eriktorbjorn eriktorbjorn at telia.com
Sun Jun 8 12:11:52 CEST 2014


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

Summary:
ddff83a87e TSAGE: R2R - Fix right-side scene border


Commit: ddff83a87ebf258a5e9832958714133098677459
    https://github.com/scummvm/scummvm/commit/ddff83a87ebf258a5e9832958714133098677459
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-06-08T12:09:14+02:00

Commit Message:
TSAGE: R2R - Fix right-side scene border

The right and left sides of the scene border are actually two
different images. You could see that the colors didn't line up at
the seams, but no one even noticed. Until now.

Changed paths:
    engines/tsage/user_interface.cpp



diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 45bfe2b..3ee585d 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -289,12 +289,13 @@ void UICollection::draw() {
 void UICollection::r2rDrawFrame() {
 	Visage visage;
 	visage.setVisage(2, 1);
-	GfxSurface vertLine = visage.getFrame(1);
+	GfxSurface vertLineLeft = visage.getFrame(1);
+	GfxSurface vertLineRight = visage.getFrame(3);
 	GfxSurface horizLine = visage.getFrame(2);
 
 	GLOBALS._screenSurface.copyFrom(horizLine, 0, 0);
-	GLOBALS._screenSurface.copyFrom(vertLine, 0, 3);
-	GLOBALS._screenSurface.copyFrom(vertLine, SCREEN_WIDTH - 4, 3);
+	GLOBALS._screenSurface.copyFrom(vertLineLeft, 0, 3);
+	GLOBALS._screenSurface.copyFrom(vertLineRight, SCREEN_WIDTH - 4, 3);
 
 	// Restrict drawing area to exclude the borders at the edge of the screen
 	R2_GLOBALS._screenSurface._clipRect = Rect(4, 3, SCREEN_WIDTH - 4,






More information about the Scummvm-git-logs mailing list