update to 1.6.1

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2016-07-01 01:42:17 +03:00
parent b42123c570
commit ecdb1590ab
86 changed files with 5892 additions and 533 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: 32bpp_anim.cpp 26970 2014-10-06 19:15:00Z rubidium $ */
/* $Id: 32bpp_anim.cpp 27590 2016-05-29 19:01:50Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -20,6 +20,11 @@
/** Instantiation of the 32bpp with animation blitter factory. */
static FBlitter_32bppAnim iFBlitter_32bppAnim;
Blitter_32bppAnim::~Blitter_32bppAnim()
{
free(this->anim_buf);
}
template <BlitterMode mode>
inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom)
{

View File

@@ -1,4 +1,4 @@
/* $Id: 32bpp_anim.hpp 26214 2014-01-02 23:52:13Z rubidium $ */
/* $Id: 32bpp_anim.hpp 27590 2016-05-29 19:01:50Z frosch $ */
/*
* This file is part of OpenTTD.
@@ -29,6 +29,8 @@ public:
anim_buf_height(0)
{}
~Blitter_32bppAnim();
/* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
/* virtual */ void DrawColourMappingRect(void *dst, int width, int height, PaletteID pal);
/* virtual */ void SetPixel(void *video, int x, int y, uint8 colour);