[Scummvm-cvs-logs] scummvm master -> 430d5be5bfff2ef69165a96270aba8c80a93897f

csnover csnover at users.noreply.github.com
Sun Mar 13 19:28:40 CET 2016


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:
80098c8423 SCI32: Remove incorrect note about dword_C6288
430d5be5bf SCI32: Add note about kCantBeHere rect


Commit: 80098c842342111fc8d7738856d5bde426f4f7c6
    https://github.com/scummvm/scummvm/commit/80098c842342111fc8d7738856d5bde426f4f7c6
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-13T13:20:17-05:00

Commit Message:
SCI32: Remove incorrect note about dword_C6288

Any reason why flipping this condition did anything to GK1
rendering was due to other unrelated bugs in the renderer.

Changed paths:
    engines/sci/graphics/plane32.cpp



diff --git a/engines/sci/graphics/plane32.cpp b/engines/sci/graphics/plane32.cpp
index 099d4dd..b019770 100644
--- a/engines/sci/graphics/plane32.cpp
+++ b/engines/sci/graphics/plane32.cpp
@@ -395,7 +395,6 @@ void Plane::calcLists(Plane &visiblePlane, const PlaneList &planeList, DrawList
 	// over the currently inserted entries later.
 	DrawList::size_type drawListSizePrimary = drawList.size();
 
-	// NOTE: Setting this to true fixes the menu bars in GK1
 	if (/* TODO: dword_C6288 */ false) {  // "high resolution pictures"????
 		_screenItemList.sort();
 		bool encounteredPic = false;


Commit: 430d5be5bfff2ef69165a96270aba8c80a93897f
    https://github.com/scummvm/scummvm/commit/430d5be5bfff2ef69165a96270aba8c80a93897f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-13T13:28:14-05:00

Commit Message:
SCI32: Add note about kCantBeHere rect

Changed paths:
    engines/sci/graphics/compare.cpp



diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 8b2d5e2..729eeea 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -158,6 +158,10 @@ reg_t GfxCompare::kernelCanBeHere(reg_t curObject, reg_t listReference) {
 }
 
 reg_t GfxCompare::kernelCantBeHere32(const reg_t curObject, const reg_t listReference) const {
+	// Most of SCI32 graphics code converts rects from the VM to exclusive
+	// rects before operating on them, but this call leverages SCI16 engine
+	// code that operates on inclusive rects, so the rect's bottom-right
+	// point is not modified like in other SCI32 kernel calls
 	Common::Rect checkRect(
 		readSelectorValue(_segMan, curObject, SELECTOR(brLeft)),
 		readSelectorValue(_segMan, curObject, SELECTOR(brTop)),






More information about the Scummvm-git-logs mailing list