update to 1.4.4

This commit is contained in:
Pavel Stupnikov
2015-01-02 04:56:11 +03:00
parent 44bec9e0da
commit afbb1b0617
237 changed files with 11473 additions and 8030 deletions
+12 -1
View File
@@ -1,4 +1,4 @@
/* $Id: 32bpp_simple.cpp 26103 2013-11-25 13:06:33Z rubidium $ */
/* $Id: 32bpp_simple.cpp 26541 2014-04-29 18:18:52Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -45,6 +45,17 @@ void Blitter_32bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoo
}
break;
case BM_CRASH_REMAP:
if (src->m == 0) {
if (src->a != 0) {
uint8 g = MakeDark(src->r, src->g, src->b);
*dst = ComposeColourRGBA(g, g, g, src->a, *dst);
}
} else {
if (bp->remap[src->m] != 0) *dst = ComposeColourPA(this->AdjustBrightness(this->LookupColourInPalette(bp->remap[src->m]), src->v), src->a, *dst);
}
break;
case BM_TRANSPARENT:
/* TODO -- We make an assumption here that the remap in fact is transparency, not some colour.
* This is never a problem with the code we produce, but newgrfs can make it fail... or at least: