- Various fixes for compiling working 64-bit binaries with Visual C++. The

number of changes was pleasantly small, and a cursory check seems to show
  everything working alright.


SVN r948 (trunk)
This commit is contained in:
Randy Heit 2008-04-29 02:43:42 +00:00
commit bc5f49dd49
23 changed files with 470 additions and 112 deletions

View file

@ -411,7 +411,7 @@ int FMultiPatchTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rota
for(int i=0;i<NumParts;i++)
{
int ret;
int ret = -1;
if (!Parts[i].Texture->bComplex || inf == NULL)
{
@ -1018,7 +1018,8 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part)
static const char *styles[] = {"copy", "blend", "add", "subtract", "reversesubtract", "modulate", "copyalpha", NULL };
sc.MustGetString();
part.op = sc.MustMatchString(styles);
bTranslucentPatches = bComplex = (part.op != OP_COPY);
bComplex = (part.op != OP_COPY);
bTranslucentPatches = bComplex;
}
}
}