[PATCH] ddraw: Use correct union member.
Marcus Meissner
marcus at jet.franken.de
Sun Jun 14 07:32:11 CDT 2009
Hi,
gcc 4.5 trunk warned about comparing different enum types,
and yes, it should be better dtstTransformStateType.
(won't change the resulting code, since drstRenderStateType is the
same value)
Ciao, Marcus
---
dlls/ddraw/executebuffer.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
index 3ff794d..73e0657 100644
--- a/dlls/ddraw/executebuffer.c
+++ b/dlls/ddraw/executebuffer.c
@@ -227,14 +227,14 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This,
} else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) {
ERR("Handle %d is not a matrix handle\n", ci->u2.dwArg[0]);
} else {
- if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_WORLD)
+ if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_WORLD)
lpDevice->world = ci->u2.dwArg[0];
- if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_VIEW)
+ if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_VIEW)
lpDevice->view = ci->u2.dwArg[0];
- if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_PROJECTION)
+ if(ci->u1.dtstTransformStateType == D3DTRANSFORMSTATE_PROJECTION)
lpDevice->proj = ci->u2.dwArg[0];
IDirect3DDevice7_SetTransform((IDirect3DDevice7 *)lpDevice,
- ci->u1.drstRenderStateType, (LPD3DMATRIX)lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr);
+ ci->u1.dtstTransformStateType, (LPD3DMATRIX)lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr);
}
instr += size;
}
--
1.5.6
More information about the wine-patches
mailing list