[Scummvm-git-logs] scummvm master -> c3e199309e3a46a025fa638f5c855c44dae5d64b

[sluicebox]

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:
c3e199309e SCI: Fix transposed pic transitions


Commit: c3e199309e3a46a025fa638f5c855c44dae5d64b
    https://github.com/scummvm/scummvm/commit/c3e199309e3a46a025fa638f5c855c44dae5d64b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-08-02T22:02:35-07:00

Commit Message:
SCI: Fix transposed pic transitions

Fixes two pic transitions which were backwards. The oldTransitionIDs
table masked this bug in several games. These are the transitions that
go to and from the edge of the screen and the center from all sides.

Examples of both transitions:
KQ6 entering oracle room 380
ECO2 restarting from any room

Example with the two-part blackout effect:
KQ4 looking through keyhole in room 51

Changed paths:
    engines/sci/graphics/transitions.cpp
    engines/sci/graphics/transitions.h


diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 4c8fc89fc6..a51324b2c7 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -61,8 +61,8 @@ static const GfxTransitionTranslateEntry oldTransitionIDs[] = {
 	{  12, SCI_TRANSITIONS_STRAIGHT_FROM_LEFT,			true },
 	{  13, SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM,		true },
 	{  14, SCI_TRANSITIONS_STRAIGHT_FROM_TOP,			true },
-	{  15, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER,		true },
-	{  16, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER,		true },
+	{  15, SCI_TRANSITIONS_DIAGONALROLL_TOCENTER,		true },
+	{  16, SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER,		true },
 	{  17, SCI_TRANSITIONS_BLOCKS,						true },
 	{  18, SCI_TRANSITIONS_PIXELATION,					false },
 	{  27, SCI_TRANSITIONS_PIXELATION	,				true },
diff --git a/engines/sci/graphics/transitions.h b/engines/sci/graphics/transitions.h
index 05842a4d2a..d02121e7fa 100644
--- a/engines/sci/graphics/transitions.h
+++ b/engines/sci/graphics/transitions.h
@@ -40,8 +40,8 @@ enum {
 	SCI_TRANSITIONS_STRAIGHT_FROM_LEFT			= 3,
 	SCI_TRANSITIONS_STRAIGHT_FROM_BOTTOM		= 4,
 	SCI_TRANSITIONS_STRAIGHT_FROM_TOP			= 5,
-	SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER		= 6,
-	SCI_TRANSITIONS_DIAGONALROLL_TOCENTER		= 7,
+	SCI_TRANSITIONS_DIAGONALROLL_TOCENTER		= 6,
+	SCI_TRANSITIONS_DIAGONALROLL_FROMCENTER		= 7,
 	SCI_TRANSITIONS_BLOCKS						= 8,
 	SCI_TRANSITIONS_PIXELATION					= 9,
 	SCI_TRANSITIONS_FADEPALETTE					= 10,