From 5994df1407f55a024d0ac69ef9278f8bb00635f4 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Mon, 23 Dec 2024 11:05:09 -0700
Subject: [PATCH] Match

---
 LEGO1/omni/src/video/mxdisplaysurface.cpp | 126 ++++++++++++----------
 1 file changed, 68 insertions(+), 58 deletions(-)

diff --git a/LEGO1/omni/src/video/mxdisplaysurface.cpp b/LEGO1/omni/src/video/mxdisplaysurface.cpp
index d88038bd..d08322ce 100644
--- a/LEGO1/omni/src/video/mxdisplaysurface.cpp
+++ b/LEGO1/omni/src/video/mxdisplaysurface.cpp
@@ -1,6 +1,7 @@
 #include "mxdisplaysurface.h"
 
 #include "mxbitmap.h"
+#include "mxdebug.h"
 #include "mxmisc.h"
 #include "mxomni.h"
 #include "mxpalette.h"
@@ -740,65 +741,74 @@ void MxDisplaySurface::DrawTransparentRLE(
 }
 
 // FUNCTION: LEGO1 0x100bb850
-void MxDisplaySurface::VTable0x34(MxU8 *p_pixels, MxS32 p_bpp, MxS32 p_width, MxS32 p_height, MxS32 p_x, MxS32 p_y)
+// FUNCTION: BETA10 0x10141191
+void MxDisplaySurface::VTable0x34(MxU8* p_pixels, MxS32 p_bpp, MxS32 p_width, MxS32 p_height, MxS32 p_x, MxS32 p_y)
 {
-    DDSURFACEDESC surfaceDesc;
-    memset(&surfaceDesc, 0, sizeof(surfaceDesc));
-    surfaceDesc.dwSize = sizeof(surfaceDesc);
-    HRESULT result = m_ddSurface2->Lock(NULL, &surfaceDesc, DDLOCK_WAIT, NULL);
-    if (result == DDERR_SURFACELOST) {
-        m_ddSurface2->Restore();
-        result = m_ddSurface2->Lock(NULL, &surfaceDesc, DDLOCK_WAIT, NULL);
-    }
-    if (result != DD_OK) {
-        return;
-    }
-    int dst_bitcount = m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount;
-    switch (dst_bitcount) {
-    case 8:
-        if (p_bpp == 16) {
-            // BUG: should go to end of function and unlock m_ddSurface2
-            return;
-        } else {
-            MxU8 *dst = (MxU8 *)surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + p_x;
-            MxU8 *src = p_pixels;
-            while (p_height != 0) {
-                p_height--;
-                memcpy(dst, src, p_width);
-                src += p_width;
-                dst += surfaceDesc.lPitch;
-            }
-        }
-        break;
-    case 16:
-        switch (p_bpp) {
-        case 16: {
-            MxU8 *dst = (MxU8 *)surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + 2 * p_x;
-            MxU8 *src = p_pixels;
-            while (p_height != 0) {
-                p_height--;
-                memcpy(dst, src, 2 * p_width);
-                src += 2 * p_width;
-                dst += surfaceDesc.lPitch;
-            }
-            break;
-        }
-        case 8: {
-            MxU8 *dst = (MxU8 *)surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + 2 * p_x;
-            MxU8 *src = p_pixels;
-            for (MxS32 i = 0; i < p_height; src += p_width, dst += surfaceDesc.lPitch, i++) {
-                for (MxS32 j = 0; j < p_width; dst += 2, src += 1, j++) {
-                    *(MxU16 *) dst = m_16bitPal[*src];
-                }
-            }
-            break;
-        }
-        default:
-            break;
-        }
-        break;
-    }
-    m_ddSurface2->Unlock(surfaceDesc.lpSurface);
+	DDSURFACEDESC surfaceDesc;
+	memset(&surfaceDesc, 0, sizeof(surfaceDesc));
+	surfaceDesc.dwSize = sizeof(surfaceDesc);
+
+	HRESULT result = m_ddSurface2->Lock(NULL, &surfaceDesc, DDLOCK_WAIT, NULL);
+
+	if (result == DDERR_SURFACELOST) {
+		m_ddSurface2->Restore();
+		result = m_ddSurface2->Lock(NULL, &surfaceDesc, DDLOCK_WAIT, NULL);
+	}
+
+	if (result == DD_OK) {
+		MxU8* pixels = p_pixels;
+
+		switch (m_surfaceDesc.ddpfPixelFormat.dwRGBBitCount) {
+		case 8: {
+			if (p_bpp == 16) {
+				MxTrace("16 bit source to 8 bit display NOT_IMPLEMENTED");
+				assert(0);
+				return;
+			}
+
+			MxU8* dst = (MxU8*) surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + p_x;
+			MxLong stride = p_width;
+			MxLong length = surfaceDesc.lPitch;
+
+			while (p_height--) {
+				memcpy(dst, pixels, p_width);
+				pixels += stride;
+				dst += length;
+			}
+			break;
+		}
+		case 16: {
+			if (p_bpp == 16) {
+				MxU8* dst = (MxU8*) surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + p_x;
+				MxLong stride = p_width * 2;
+				MxLong length = surfaceDesc.lPitch;
+
+				while (p_height--) {
+					memcpy(dst, pixels, 2 * p_width);
+					pixels += stride;
+					dst += length;
+				}
+			}
+			else if (p_bpp == 8) {
+				MxU8* dst = (MxU8*) surfaceDesc.lpSurface + p_y * surfaceDesc.lPitch + 2 * p_x;
+				MxLong stride = p_width * 2;
+				MxLong length = -2 * p_width + surfaceDesc.lPitch;
+
+				for (MxS32 i = 0; i < p_height; i++) {
+					for (MxS32 j = 0; j < p_width; j++) {
+						*(MxU16*) dst = m_16bitPal[*pixels++];
+						dst += 2;
+					}
+
+					pixels += stride;
+					dst += length;
+				}
+			}
+		}
+		}
+
+		m_ddSurface2->Unlock(surfaceDesc.lpSurface);
+	}
 }
 
 // FUNCTION: LEGO1 0x100bba50