Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23927) -Fix [FS#5056]: 32bpp animated blitter was optimised a bit too far regarding not needing to update the colour mapping when (re)initialising the palette

Browse Source
This commit is contained in:
rubidium 2012-02-11 20:08:31 +00:00
parent 1b13eb49dd
commit 0e925c9e5e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/blitter/32bpp_anim.cpp
View File

@ -417,10 +417,9 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)
this->palette = palette;
/* If first_dirty is 0, it is for 8bpp indication to send the new
* palette. As we dont do that for 32bpp, ignore that request
* completely */
if (this->palette.first_dirty == 0) return;
assert(this->palette.first_dirty == PALETTE_ANIM_START);
* palette. However, only the animation colours might possibly change.
* Especially when going between toyland and non-toyland. */
assert(this->palette.first_dirty == PALETTE_ANIM_START || this->palette.first_dirty == 0);
const uint16 *anim = this->anim_buf;
uint32 *dst = (uint32 *)_screen.dst_ptr;

2
src/script/api/script_news.cpp
View File

@ -21,7 +21,7 @@
EnforcePrecondition(false, text != NULL);
EnforcePrecondition(false, !StrEmpty(text->GetEncodedText()));
EnforcePrecondition(false, type >= NT_ARRIVAL_COMPANY && type <= NT_GENERAL);
EnforcePrecondition(false, type == NT_ECONOMY || type == NT_SUBSIDIES || type == NT_GENERAL);
EnforcePrecondition(false, company == ScriptCompany::COMPANY_INVALID || ScriptCompany::ResolveCompanyID(company) != ScriptCompany::COMPANY_INVALID);
uint8 c = company;