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

athrxx athrxx at scummvm.org
Wed Dec 28 00:57:36 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:
cc40a019e5 KYRA: (EOB) - fix EOB1 intro glitch


Commit: cc40a019e5f93f79d43b22773a04101006048e9f
    https://github.com/scummvm/scummvm/commit/cc40a019e5f93f79d43b22773a04101006048e9f
Author: athrxx (athrxx at scummvm.org)
Date: 2011-12-27T15:56:55-08:00

Commit Message:
KYRA: (EOB) - fix EOB1 intro glitch

Changed paths:
    engines/kyra/eobcommon.cpp
    engines/kyra/sequences_eob.cpp



diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 304d1a4..15cabd9 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -1059,7 +1059,7 @@ int EoBCoreEngine::countCharactersWithSpecificItems(int16 itemType, int16 itemVa
 }
 
 int EoBCoreEngine::checkInventoryForItem(int character, int16 itemType, int16 itemValue) {
-	if (character < 0 )
+	if (character < 0)
 		return -1;
 
 	for (int i = 0; i < 27; i++) {
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 2d8e854..65c149e 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -539,7 +539,7 @@ void EoBEngine::seq_hands() {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->fillRect(0, 0, 167, 63, 157);
 		_screen->drawShape(2, shp1, i, 4, 0);
-		_screen->drawShape(2, shp1, 105 - i, 4, 0);
+		_screen->drawShape(2, shp2, 105 - i, 4, 0);
 		_screen->copyRegion(0, 0, 144, 32, 168, 64, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
 		delayUntil(end);






More information about the Scummvm-git-logs mailing list