[Scummvm-cvs-logs] scummvm master -> 5151ad4d9f566fc94adaf7d9c59d7d49ab3b7bfe

[bluegr]

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:
93e99ba30d SCI: Remove a TODO in GK1 that has been resolved properly now
5151ad4d9f SCI: Remove another GK1-related hack


Commit: 93e99ba30d97e141bedd1b28aa7aac97faa23c0f
    https://github.com/scummvm/scummvm/commit/93e99ba30d97e141bedd1b28aa7aac97faa23c0f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-27T14:40:13+02:00

Commit Message:
SCI: Remove a TODO in GK1 that has been resolved properly now

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



diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp
index fe995a4..80d0308 100644
--- a/engines/sci/graphics/screen_item32.cpp
+++ b/engines/sci/graphics/screen_item32.cpp
@@ -202,23 +202,6 @@ void ScreenItem::setFromObject(SegManager *segMan, const reg_t object, const boo
 		writeSelectorValue(segMan, object, SELECTOR(priority), _position.y);
 	}
 
-	// TODO: At this point (needs checking), GK1 seems to check for the "visible"
-	// selector of a plane object. If the object has such a selector, and it's set
-	// to 0, then the object should be hidden.
-	//
-	// This is needed for the inventory in GK1, and seemed to be used only for that
-	// game - the "visible" selector isn't present in any other SCI32 game.
-	// Possible disabled and unverified code that checks for this follows. This fixes
-	// the inventory in GK1. Verify against disassembly!
-#if 0
-	if (lookupSelector(segMan, object, SELECTOR(visible), NULL, NULL) != kSelectorNone) {
-		if (readSelectorValue(segMan, object, SELECTOR(visible)) == 0) {
-			_fixPriority = true;
-			_priority = -1;
-		}
-	}
-#endif
-
 	_z = readSelectorValue(segMan, object, SELECTOR(z));
 	_position.y -= _z;
 


Commit: 5151ad4d9f566fc94adaf7d9c59d7d49ab3b7bfe
    https://github.com/scummvm/scummvm/commit/5151ad4d9f566fc94adaf7d9c59d7d49ab3b7bfe
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-02-27T14:40:33+02:00

Commit Message:
SCI: Remove another GK1-related hack

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



diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index e0fb56b..eabc329 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -268,11 +268,6 @@ reg_t GfxText32::createTextBitmap(reg_t textObject, uint16 maxWidth, uint16 maxH
 }
 
 reg_t GfxText32::createTextBitmapInternal(Common::String &text, reg_t textObject, uint16 maxWidth, uint16 maxHeight, reg_t prevHunk) {
-	// HACK: The character offsets of the up and down arrow buttons are off by one
-	// in GK1, for some unknown reason. Fix them here.
-	if (text.size() == 1 && (text[0] == 29 || text[0] == 30)) {
-		text.setChar(text[0] + 1, 0);
-	}
 	GuiResourceId fontId = readSelectorValue(_segMan, textObject, SELECTOR(font));
 	GfxFont *font = _cache->getFont(fontId);
 	bool dimmed = readSelectorValue(_segMan, textObject, SELECTOR(dimmed));