[Scummvm-cvs-logs] scummvm master -> 1585727ee0376c4a03c2e1e4b34569749af11b10

[sev-]

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:
8d08912d22 SCUMM HE: Implement 50/50 T14 blend mode
1585727ee0 SCUMM HE: Fix T14 special mode blending.


Commit: 8d08912d223ffb3112107b58b7ff51e0aba56448
    https://github.com/scummvm/scummvm/commit/8d08912d223ffb3112107b58b7ff51e0aba56448
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-12T18:25:10+02:00

Commit Message:
SCUMM HE: Implement 50/50 T14 blend mode

Changed paths:
    engines/scumm/he/moonbase/moonbase.cpp



diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index 414a177..c07bd98 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -107,12 +107,16 @@ void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, con
 							WRITE_LE_UINT16(dst1, READ_LE_UINT16(src));
 						} else if (rawROP == 2) { // MMX_ADDITIVE
 							uint16 color = READ_LE_UINT16(src);
-							uint32 orig = READ_LE_UINT16(dst1);
+							uint16 orig = READ_LE_UINT16(dst1);
 
 							uint32 r = MIN<uint32>(0x7c00, (orig & 0x7c00) + (color & 0x7c00));
 							uint32 g = MIN<uint32>(0x03e0, (orig & 0x03e0) + (color & 0x03e0));
 							uint32 b = MIN<uint32>(0x001f, (orig & 0x001f) + (color & 0x001f));
 							WRITE_LE_UINT16(dst1, (r | g | b));
+						} else if (rawROP == 5) { // MMX_CHEAP_50_50
+							uint16 color = (READ_LE_UINT16(src) >> 1) & 0x3DEF;
+							uint16 orig = (READ_LE_UINT16(dst1) >> 1) & 0x3DEF;
+							WRITE_LE_UINT16(dst1, (color + orig));
 						}
 						dst1 += 2;
 					}


Commit: 1585727ee0376c4a03c2e1e4b34569749af11b10
    https://github.com/scummvm/scummvm/commit/1585727ee0376c4a03c2e1e4b34569749af11b10
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-13T00:27:37+02:00

Commit Message:
SCUMM HE: Fix T14 special mode blending.

This fixe energy shield color.

Changed paths:
    engines/scumm/he/moonbase/moonbase.cpp
    engines/scumm/he/wiz_he.cpp



diff --git a/engines/scumm/he/moonbase/moonbase.cpp b/engines/scumm/he/moonbase/moonbase.cpp
index c07bd98..34d4368 100644
--- a/engines/scumm/he/moonbase/moonbase.cpp
+++ b/engines/scumm/he/moonbase/moonbase.cpp
@@ -155,8 +155,7 @@ void Moonbase::blitT14WizImage(uint8 *dst, int dstw, int dsth, int dstPitch, con
 							} else {
 								uint32 pix = ((orig << 16) | orig) & 0x3e07c1f;
 								pix = (((pix * alpha) & 0xffffffff) >> 5) & 0x3e07c1f;
-								pix = ((pix << 16) + pix + color) & 0xffff;
-
+								pix = ((pix >> 16) + pix + color) & 0xffff;
 								WRITE_LE_UINT16(dst1, pix);
 							}
 						}
diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp
index 2a9f7ec..43994c3 100644
--- a/engines/scumm/he/wiz_he.cpp
+++ b/engines/scumm/he/wiz_he.cpp
@@ -1800,7 +1800,7 @@ void Wiz::copy555WizImage(uint8 *dst, uint8 *wizd, int dstPitch, int dstType,
 		break;
 
 	case 5:
-		warning("T14: MMX_CHEAP_50_50");
+		//warning("T14: MMX_CHEAP_50_50");
 		break;
 
 	case 6: