From 7f1799f6a0cca558075f4fba9fcbe3d9115bafe8 Mon Sep 17 00:00:00 2001
From: Aaron Robinson <caustik@caustik.com>
Date: Wed, 18 Feb 2004 19:27:13 +0000
Subject: [PATCH] fixed few small things

---
 Cxbx.opt                          | Bin 58880 -> 64512 bytes
 Source/Win32/CxbxKrnl/EmuD3D8.cpp |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cxbx.opt b/Cxbx.opt
index 8eea27cbed7b1a6210bdf567d0f277188b1c39a5..1dba1412c447e0376151c870447f2ba484b2c24d 100644
GIT binary patch
delta 973
zcmb7C&ubG=5T5<%QnxnJSTG7rr9vs9@!~IH(QI<CidL<#hsBa^worZShRs%E6|>+)
zkP6*NJt_3;DRezbLC~8g{|Im1qNoSsY}S;8w3RM=!+taKzIpRz{Lg~_Q)rC~q6+{x
zA*>(&)9G|PB1?n^golJW;Sph(@R;xfKM2Etc#YeKW8$dXy87+woge6mHwQtX@Bo2S
zI(SeT$F?}D$VrDM&0w*R!?u*+ig;=AFy<zQx_>9SHWN1Fi&8jqptV0-mz#W$IlEi*
z<gU>|QRS$(l(@j@F(QzT48U!0s8bhAuwV`}Vm5fh9bm+-5L*C;nmm%40G^AQ>V0u@
zg$%wdoWYM;4n6HCrnGa4NU~8<oS^+0IaI29mTQ+;wrEu?yJFeqqE!pkQcLW0`G#*?
zehnbd(Nx}cysYWip6f7XRi;KN7mRY*b!?;RI`=Hos~Ki}z79M1l_+@Mwb|Z;8vPZ-
zNNH~>+lyG)g+*r7q<rbdt*O}dy@|BlqXfDkfDbswM)8wAG{8qA^CJ^J)6Z}1h|dSi
zkmCTZuwz)&MSRMJ|GB~yb}E_MRPec$S5=Zp4pW|vgwyyNm$_M7YF;1gn>TkCzc(A$
zUQ36H|87f@c2rkF<yF$N@%DWpzOk8P=&yNlEv~jIPpiFKbhl<z_WtY01z%+T1s^J#
H$&!BoI)i46

delta 1273
zcmZqp!Q60$d4mcw%fJ8s|4-InUNAAlViJoFBirPQEDEekj$bJJI=P4?ke892fq{Vq
zh=I!fPZnfVnf!$%go71XpoBGmhXX2rP{k_6=scO9O#@6yP7Y)fhOjo*vDvXQYiwP(
zc_N!DBeM*cp~=Yqhk>1uNq~W&f{_`7fwBj=CrO!8pq*WuiG`7gNq_@vro-Y1j4a6&
zNvZO<oK?j<NsrF<Ik`+e!fL>%IQgrSKMxm17&=K!?sK-{U_=RRXPL<YQ%okiI2%m<
z;{0>+To?Jt(_K_IYq)l^5EraugiB7$<eX_DldE#XH_y&7B{KTRu%{tr^3n#m$t?}y
zo0m3d)6Sk8j?Em?w$RS}DIAkKrsObsP5wH?Z}Q<Owv!vCmaxSEqme;m@~@{=lfO(A
n+03zub`IFIZx30X17$u!nPk%?+L=A+1sgEyvtQauGuHzEjw@6|

diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
index 86fcc2f2d..8baaeeddd 100644
--- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp
+++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp
@@ -2439,8 +2439,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateTexture
         (*ppTexture)->Format = 0x24;
 
         (*ppTexture)->Size  = (g_dwOverlayW & X_D3DSIZE_WIDTH_MASK);
-        (*ppTexture)->Size &= (g_dwOverlayH << X_D3DSIZE_HEIGHT_SHIFT);
-        (*ppTexture)->Size &= (g_dwOverlayP << X_D3DSIZE_PITCH_SHIFT);
+        (*ppTexture)->Size |= (g_dwOverlayH << X_D3DSIZE_HEIGHT_SHIFT);
+        (*ppTexture)->Size |= (g_dwOverlayP << X_D3DSIZE_PITCH_SHIFT);
 
         hRet = D3D_OK;
     }
@@ -2546,8 +2546,8 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_CreateVolumeTexture
         (*ppVolumeTexture)->Format = 0x24;
 
         (*ppVolumeTexture)->Size  = (g_dwOverlayW & X_D3DSIZE_WIDTH_MASK);
-        (*ppVolumeTexture)->Size &= (g_dwOverlayH << X_D3DSIZE_HEIGHT_SHIFT);
-        (*ppVolumeTexture)->Size &= (g_dwOverlayP << X_D3DSIZE_PITCH_SHIFT);
+        (*ppVolumeTexture)->Size |= (g_dwOverlayH << X_D3DSIZE_HEIGHT_SHIFT);
+        (*ppVolumeTexture)->Size |= (g_dwOverlayP << X_D3DSIZE_PITCH_SHIFT);
 
         hRet = D3D_OK;
     }
@@ -4840,9 +4840,9 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_UpdateOverlay
             int h = g_dwOverlayH;
 
             // TODO: sucker the game into rendering directly to the overlay (speed boost)
-//            if(ddsd2.lPitch == w*2)
-//                memcpy(pDest, pSour, h*w*2);
-//            else
+            if(ddsd2.lPitch == w*2 && g_dwOverlayP == w*2)
+                memcpy(pDest, pSour, h*w*2);
+            else
             {
                 for(int y=0;y<h;y++)
                 {