dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16628) -Codechange: remove one gcc2 hack

Browse Source
This commit is contained in:
smatz
2009-06-22 23:15:27 +00:00
parent 368eb3d473
commit 721a0b0608
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blitter/32bpp_anim.cpp
View File

@@ -97,7 +97,7 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
uint m = *src_n;
/* In case the m-channel is zero, do not remap this pixel in any way */
if (m == 0) {
*dst = *src_px;
*dst = src_px->data;
*anim = 0;
} else {
uint r = remap[m];
@@ -161,7 +161,7 @@ inline void Blitter_32bppAnim::Draw(const Blitter::BlitterParams *bp, ZoomLevel
uint m = *src_n++;
/* Above 217 (PALETTE_ANIM_SIZE_START) is palette animation */
*anim++ = m;
*dst++ = (m >= PALETTE_ANIM_SIZE_START) ? this->LookupColourInPalette(m) : *src_px;
*dst++ = (m >= PALETTE_ANIM_SIZE_START) ? this->LookupColourInPalette(m) : src_px->data;
src_px++;
} while (--n != 0);
} else {

2
src/blitter/32bpp_base.hpp
View File

@@ -41,7 +41,7 @@ public:
*/
static inline uint32 LookupColourInPalette(uint index)
{
return _cur_palette[index];
return _cur_palette[index].data;
}
/**

6
src/blitter/32bpp_optimized.cpp
View File

@@ -110,7 +110,7 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
uint m = *src_n;
/* In case the m-channel is zero, do not remap this pixel in any way */
if (m == 0) {
*dst = *src_px;
*dst = src_px->data;
} else {
uint r = remap[m];
if (r != 0) *dst = this->LookupColourInPalette(r);
@@ -162,7 +162,9 @@ inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomL
/* faster than memcpy(), n is usually low */
src_n += n;
do {
*dst++ = *src_px++;
*dst = src_px->data;
dst++;
src_px++;
} while (--n != 0);
} else {
src_n += n;