zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- There doesn't seem to be much point to this inf==NULL check when inf isn't used either way...

Browse source 
SVN r3635 (trunk)
This commit is contained in:
Randy Heit 2012-05-10 03:47:40 +00:00
parent 9340dc4eca
commit eb03d8e77e
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/textures/multipatchtexture.cpp
View file

@ -573,7 +573,7 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota
// rotated multipatch parts cannot be composited directly // rotated multipatch parts cannot be composited directly
bool rotatedmulti = Parts[i].Rotate != 0 && Parts[i].Texture->bMultiPatch; bool rotatedmulti = Parts[i].Rotate != 0 && Parts[i].Texture->bMultiPatch;
memset (&info, 0, sizeof (info)); memset (&info, 0, sizeof(info));
info.alpha = Parts[i].Alpha; info.alpha = Parts[i].Alpha;
info.invalpha = FRACUNIT - info.alpha; info.invalpha = FRACUNIT - info.alpha;
info.op = ECopyOp(Parts[i].op); info.op = ECopyOp(Parts[i].op);
@ -597,12 +597,11 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota
info.blendcolor[0] = b.r * (FRACUNIT-info.blendcolor[3]); info.blendcolor[0] = b.r * (FRACUNIT-info.blendcolor[3]);
info.blendcolor[1] = b.g * (FRACUNIT-info.blendcolor[3]); info.blendcolor[1] = b.g * (FRACUNIT-info.blendcolor[3]);
info.blendcolor[2] = b.b * (FRACUNIT-info.blendcolor[3]); info.blendcolor[2] = b.b * (FRACUNIT-info.blendcolor[3]);
info.blend = BLEND_OVERLAY; info.blend = BLEND_OVERLAY;
} }
} }
if ((!Parts[i].Texture->bComplex || inf == NULL) && !rotatedmulti) if (!Parts[i].Texture->bComplex && !rotatedmulti)
{ {
if (Parts[i].Translation != NULL) if (Parts[i].Translation != NULL)
{ {