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

bluegr md5 at scummvm.org
Wed Mar 2 19:09:26 CET 2011


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:
ba42c6ff7d SCI: Fixed text positioning in the credits screen of Dr. Brain Amiga


Commit: ba42c6ff7db37266062d8a03e83a2ff96714b8af
    https://github.com/scummvm/scummvm/commit/ba42c6ff7db37266062d8a03e83a2ff96714b8af
Author: md5 (md5 at scummvm.org)
Date: 2011-03-02T10:07:46-08:00

Commit Message:
SCI: Fixed text positioning in the credits screen of Dr. Brain Amiga

The additional text positioning code in kDisplay was added in SCI1
middle, not SCI1 late. Also, did some slight cleanup

Changed paths:
    engines/sci/engine/vm_types.cpp
    engines/sci/graphics/paint16.cpp



diff --git a/engines/sci/engine/vm_types.cpp b/engines/sci/engine/vm_types.cpp
index 0fc8144..85c83bb 100644
--- a/engines/sci/engine/vm_types.cpp
+++ b/engines/sci/engine/vm_types.cpp
@@ -31,8 +31,6 @@
 
 namespace Sci {
 
-extern const char *opcodeNames[]; // from scriptdebug.cpp
-
 reg_t reg_t::lookForWorkaround(const reg_t right) const {
 	SciTrackOriginReply originReply;
 	SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, arithmeticWorkarounds, &originReply);
diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp
index 20900c8..7746224 100644
--- a/engines/sci/graphics/paint16.cpp
+++ b/engines/sci/graphics/paint16.cpp
@@ -568,7 +568,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, int argc, reg_t *argv) {
 	// now drawing the text
 	_text16->Size(rect, text, -1, width);
 	rect.moveTo(_ports->getPort()->curLeft, _ports->getPort()->curTop);
-	if (getSciVersion() >= SCI_VERSION_1_LATE) {
+	if (getSciVersion() >= SCI_VERSION_1_MIDDLE) {
 		int16 leftPos = rect.right <= _screen->getWidth() ? 0 : _screen->getWidth() - rect.right;
 		int16 topPos = rect.bottom <= _screen->getHeight() ? 0 : _screen->getHeight() - rect.bottom;
 		_ports->move(leftPos, topPos);






More information about the Scummvm-git-logs mailing list