From 412237ada148e47619f39429a25d9f555073b22c Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 23 Jun 2004 03:28:28 +0000 Subject: [PATCH] minor fixes --- Cxbx.opt | Bin 60928 -> 58880 bytes Source/Win32/CxbxKrnl/EmuD3D8.cpp | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Cxbx.opt b/Cxbx.opt index c1aabeb403bff2c289e74ae63ac50a589e8d36aa..30676c003bb1536384a28a0b1d2a21968473a607 100644 GIT binary patch delta 1724 zcmd6mKWx)b5XRs0GfsxeMUiO)5t0#wFwm%iHT-Fv6iR_YT3Qc4Tc>UtYE`IdgsG4k zq%159JtPLo*sVxaydXA~OpHv3B@+@8AThK^gzq_OCAv0)E&bj--*-OW`TVM1MfH=| zt}1+(o-0ol{n6u7T@7#z{u7zX@)E+h7#j0e3+Gi~$*U4|W1f z0vph@FtSpZ!p$_80S+jFS>S>>Fb`y03HA|K1RkJmVbEuBo_>gDnmP2~MbZwI)i<1< zCSB`E_E{5S_buOXGqdH#9Pw(=cl=OG?P>m=7MI%M@{*U9&nEWu5xBybps9~5;(f45 zO?^jf1)FdTtKB;+#+9Rt`CLeX=E{dykIEG3YY86OeNF!<)=%_Cw6IJ>3#$)4<=miE zYgM~~Au@w@t#7F#+5BkXa(mS=WM2--oGW>5nO^74(8+uX1KQ#pn3(;F-r2v9&FM(C zF2gtb%*oQy#S3Q6bt?05Sw5Mz(S1M&EU#aocvk|yT=DRY)N3Ex*-oj)4xep(V};+K z%ElTWr{7o~QswPhdLf*UTyUhnGbWE64gxM|HIP8JE)CSu=j84{$HsrIg6p|6WtXb8 wBw6<{9 literal 60928 zcmeHQU2_{(8D7O7vE{`1z=RT@6)BK}*2;$qb%SdXOOE5jiG%IL23+V$dtxb;cE#?B zC^x_r*L0?TfJ=sp4#Q0uhM5k-6*uj0)9FQL;EExCfr0S6`(bOX-L%g@@*mocG_Cb%|9w2H4YuviU|Zm&qZ;ZTKbGw7~ z+D8oh2V>3Qy7dA5zyKiE{2(v{3A#P((6<3Jub2b>2k02hG? z;1xjZzK#4^T2iB2Cx8#yI0y-deW#k5+fP26OPywpIeP9z1 zyE<|cuz&{e6Tk)>zy+Fs*mawh(2|8Cb2xJoxvf1!3*Dy^xMRY;91_D#+pN8q+-mCv z>cazat5tL2Vy>u4%?-Ikj|QYa+4{G)g$-?RXl!|TW(gldBU)iaw>OkK@2dK9GE8YJ zHy*UIq-sic&)HV95%e?QS;kiljTNu24tTG9MXQ`* zba37**P4ckH92x^VYaBd`V2;!J5xCuYvgw`GFxvJCyJB1nEA#-OUkjDb~(OR-)3+* z+2UAaTvfA{HnPK8BP%x=X@&t`hQhrxrWJ~+p-e-W<%b2!boHvK?2vh%*xd~e8xuxr zvaY+8JO-J;2UAbueUUd zfr?&BtM9i;snzLY%(hCF_nb;=V`x*^rb->ffbFK&8>Nl3F8b^BwCX__W|~2N`t|BJ zQ*R#sjoJQ+r|>%7*4`7^D&5cK*YT8G_a2C{f1$XNkJ)|8E!Jvr70VUfRz_USn%=0! z?w^a@yJ*(%oan5wZOiW1+x8IasJr1^(v?cn-0Y~k*_7LV=lO+?)D>GVkf>m!+(dI@zpU;LD8ISJl0{RJd%c0rvn1pk@SKVmZ7^h`k%E|b*K6bs^Bj%X# ztlzOTiq5?=Lto1AcW1NSNWpKj<_7zuUGJ2~bLVqPuI?Gdp-VRaPlWyNDRZ%dp|_3OH=wol8UUcZN-ClFiIHf(& z&_v(VJt}w^%_2$N(8217zTtV1W8x^fFNYi}KNH zDb(Mn|M~jhv#S3MVfNq6h3g`{Q~%@qzwN1y)c>gerA;@Z{wLE`ssHVm7D)Y%`XBYb zUcWW-I5I#6$N(8215bwm>VHw5ssBa!=(R-s&z}$Ytk3_8^S@rjOj8qn$>JBiTRH{* z<6#(i&c|K)AAeOE4g8Pi;YB|WZ}@`N(n?)uXep{6^| z-Ku&pFg3flG~NDsR17@#>arLqr@it}=oJ@#>@hhO{%tw{wBG>R;)5ZM@`&3SRULDzN`I}zD-eA3&z{lAiv3O8>4vp}2 zOWM=cRQqY}7}`?1t0euu!K?3?PXF(nF6W+WI{m*B9rNk`?N7L-|Mw0ld5!+x^#6v- zJN>`A`zlB)GC&5%02v?yT{A%aH%b-t-zXowmZ<;k5B>MeN4|D>+|$y+=!sq!ry<$p z2WK4eLn9&pU5wpWcU@!!E7Cm8HDnImZaS5jCYFe?(|opfU210ZE;v%H-CO#UuSpZ| zfHg~ubVj?Fyx6u*l>Zh%VaQmtMbd^Efg<2FL&zAOmE843GgbKnBPF z86X46421K46BbE7ByzpyG4Cz^zWqBuf_>sb>`5YjLOV(33BL&>b}J{I(1lcm>NeMZ z?+AU%_^-)7PjLMwuK#2jjQ_fGMlIKW;`;BU<_6=x%6AJUGC&5%02v?yWPl8i0Wv@a z$N(821J4cvVf^7gEZ3}(EDERO>Suo8tqSaLW5Sp$>*?Csa7lNROZ{&d0^ER6+DIdm@n0DKh4Eh)|3$u8 zF_8f>KnBPF8TkJ)K>aVuFZI7DAH9~S|LqU`FYBp)a+Sl`oBh}xT-Duj>k!uUHMcvhBpp@()>~Z}!uK!j^ zRwcRq8`pnJzB{=78|VKS)`O{Ym5J$W!Kyc^wJPWTgQVw`+EQ8QMzqyO)iH>=58-s&*@f9d}l!vN?1Rck7k zv&{K_wlX@LaPi<+(;L;;{d2K<7flFPo!-2&wr$xR2ekdT(oskMU+RCoe!b;!WPl8i c0Wv@a_B8|4|Du> 8); FLOAT b = DWtoF((Color & 0x000000FF) >> 0); - return EmuIDirect3DDevice8_SetVertexData4f(Register, a, g, b, a); + return EmuIDirect3DDevice8_SetVertexData4f(Register, r, g, b, a); } // ****************************************************************** @@ -3649,9 +3655,9 @@ HRESULT WINAPI XTL::EmuIDirect3DDevice8_End() if(g_IVBTblOffs != 0) EmuFlushIVB(); - CxbxFree(g_pIVBVertexBuffer); - - CxbxFree(g_IVBTable); + // TODO: Should technically clean this up at some point..but on XP doesnt matter much +// CxbxFree(g_pIVBVertexBuffer); +// CxbxFree(g_IVBTable); EmuSwapFS(); // XBox FS