[Scummvm-cvs-logs] scummvm master -> 6ad66320709973afd870cad10b0ef7f4155afa3a

bluegr bluegr at gmail.com
Thu Dec 24 12:08:38 CET 2015


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:
f8bf5ed867 LAB: Simplify flowText() a bit
6ad6632070 LAB: Remove excess delay in map


Commit: f8bf5ed867e0a4ebe4b7a30361217bfc85656dbc
    https://github.com/scummvm/scummvm/commit/f8bf5ed867e0a4ebe4b7a30361217bfc85656dbc
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-24T13:07:18+02:00

Commit Message:
LAB: Simplify flowText() a bit

Since the extra image buffer is only used in one place, we can save
ourselves one assignment

Changed paths:
    engines/lab/dispman.cpp



diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index b6ffbf8..376c8ad 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -149,11 +149,10 @@ int DisplayMan::flowText(TextFont *font, int16 spacing, byte penColor, byte back
 			bool fillBack, bool centerh, bool centerv, bool output, Common::Rect textRect, const char *str, Image *targetImage) {
 
 	byte *saveDisplayBuffer = _currentDisplayBuffer;
-	uint32 bytesPerPage = _screenBytesPerPage;
 
 	if (targetImage) {
 		_currentDisplayBuffer = targetImage->_imageData;
-		_screenBytesPerPage = (uint32)targetImage->_width * (int32)targetImage->_height;
+		assert(_screenBytesPerPage == (uint32)(targetImage->_width * targetImage->_height));
 	}
 
 	if (fillBack)
@@ -201,7 +200,6 @@ int DisplayMan::flowText(TextFont *font, int16 spacing, byte penColor, byte back
 
 	len--;
 
-	_screenBytesPerPage = bytesPerPage;
 	_currentDisplayBuffer = saveDisplayBuffer;
 
 	return len;


Commit: 6ad66320709973afd870cad10b0ef7f4155afa3a
    https://github.com/scummvm/scummvm/commit/6ad66320709973afd870cad10b0ef7f4155afa3a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-12-24T13:07:53+02:00

Commit Message:
LAB: Remove excess delay in map

Changed paths:
    engines/lab/map.cpp



diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index fa657c0..d84f852 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -422,11 +422,6 @@ void LabEngine::processMap(uint16 curRoom) {
 			_graphics->writeColorRegs(newcolor, 1, 1);
 			_event->updateMouse();
 			waitTOF();
-			_event->updateMouse();
-			waitTOF();
-			_event->updateMouse();
-			waitTOF();
-			_event->updateMouse();
 
 			place++;
 






More information about the Scummvm-git-logs mailing list