Replace unsafe Matrix4/D3DMATRIX casts in W3DWater for Generals

Author: bobtista

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -235,14 +235,20 @@ void WaterRenderObjClass::setupJbaWaterShader(void)
 
 		Matrix4x4 curView;
 		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+		D3DXMATRIX d3dCurView(
+			curView[0][0], curView[0][1], curView[0][2], curView[0][3],
+			curView[1][0], curView[1][1], curView[1][2], curView[1][3],
+			curView[2][0], curView[2][1], curView[2][2], curView[2][3],
+			curView[3][0], curView[3][1], curView[3][2], curView[3][3]
+		);
+		D3DXMatrixInverse(&inv, &det, &d3dCurView);
 		D3DXMATRIX scale;
 
 		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
 		D3DXMATRIX destMatrix = inv * scale;
 		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
 		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, destMatrix);
 
 	}
 	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );
@@ -1579,7 +1585,13 @@ void WaterRenderObjClass::Render(RenderInfoClass & rinfo)
 				DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
 
 				//get inverse of view matrix(= view to world matrix)
-				D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+				D3DXMATRIX d3dCurView(
+					curView[0][0], curView[0][1], curView[0][2], curView[0][3],
+					curView[1][0], curView[1][1], curView[1][2], curView[1][3],
+					curView[2][0], curView[2][1], curView[2][2], curView[2][3],
+					curView[3][0], curView[3][1], curView[3][2], curView[3][3]
+				);
+				D3DXMatrixInverse(&inv, &det, &d3dCurView);
 
 				//create clipping matrix by inserting our plane equation into the 1st column
 				D3DXMatrixIdentity(&clipMatrix);
@@ -2964,14 +2976,20 @@ void WaterRenderObjClass::setupFlatWaterShader(void)
 
 		Matrix4x4 curView;
 		DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);
-		D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
+		D3DXMATRIX d3dCurView(
+			curView[0][0], curView[0][1], curView[0][2], curView[0][3],
+			curView[1][0], curView[1][1], curView[1][2], curView[1][3],
+			curView[2][0], curView[2][1], curView[2][2], curView[2][3],
+			curView[3][0], curView[3][1], curView[3][2], curView[3][3]
+		);
+		D3DXMatrixInverse(&inv, &det, &d3dCurView);
 		D3DXMATRIX scale;
 
 		D3DXMatrixScaling(&scale, NOISE_REPEAT_FACTOR, NOISE_REPEAT_FACTOR,1);
 		D3DXMATRIX destMatrix = inv * scale;
 		D3DXMatrixTranslation(&scale, m_riverVOrigin, m_riverVOrigin,0);
 		destMatrix = destMatrix*scale;
-		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, *(Matrix4x4*)&destMatrix);
+		DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, destMatrix);
 
 	}
 	m_pDev->SetTextureStageState( 0, D3DTSS_MINFILTER, D3DTEXF_LINEAR );