[Scummvm-git-logs] scummvm master -> 68218d15f27146a952d18c20b4130c3fb14580c6

csnover csnover at users.noreply.github.com
Tue May 2 18:01:28 CEST 2017


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:
68218d15f2 SCI32: Fix incorrect arguments to readPixel in kCelInfo


Commit: 68218d15f27146a952d18c20b4130c3fb14580c6
    https://github.com/scummvm/scummvm/commit/68218d15f27146a952d18c20b4130c3fb14580c6
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-02T11:00:45-05:00

Commit Message:
SCI32: Fix incorrect arguments to readPixel in kCelInfo

Fixes Trac#9750.

Changed paths:
    engines/sci/engine/kgraphics32.cpp


diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index f332e17..b0a1c70 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -451,7 +451,7 @@ reg_t kCelInfoGetOriginY(EngineState *s, int argc, reg_t *argv) {
 
 reg_t kCelInfoGetPixel(EngineState *s, int argc, reg_t *argv) {
 	CelObjView view(argv[0].toUint16(), argv[1].toSint16(), argv[2].toSint16());
-	return make_reg(0, view.readPixel(argv[4].toSint16(), argv[5].toSint16(), view._mirrorX));
+	return make_reg(0, view.readPixel(argv[3].toSint16(), argv[4].toSint16(), view._mirrorX));
 }
 
 reg_t kScrollWindow(EngineState *s, int argc, reg_t *argv) {





More information about the Scummvm-git-logs mailing list