diff options
| author | rubidium <rubidium@openttd.org> | 2014-01-03 17:55:40 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-01-03 17:55:40 +0000 |
| commit | 613fb9c6ef6888568a47e5e08f462839bcfe7758 (patch) | |
| tree | 5606348eab816a4c253557439e50a601e13d8f80 /src | |
| parent | 9947bdb0c424c7d77dfbaac87390f34a3ac31b0f (diff) | |
| download | openttd-613fb9c6ef6888568a47e5e08f462839bcfe7758.tar.xz | |
(svn r26221) -Codechange: normalize constant names in anim-sse4 with the others (MJP)
Diffstat (limited to 'src')
| -rw-r--r-- | src/blitter/32bpp_anim_sse4.cpp | 4 | ||||
| -rw-r--r-- | src/blitter/32bpp_anim_sse4.hpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp index c6008b007..27defd6de 100644 --- a/src/blitter/32bpp_anim_sse4.cpp +++ b/src/blitter/32bpp_anim_sse4.cpp @@ -372,7 +372,7 @@ void Blitter_32bppSSE4_Anim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, switch (mode) { case BM_NORMAL: { const BlockType bt_last = (BlockType) (bp->width & 1); - if (bp->skip_left != 0 || bp->width <= MARGIN_THRESHOLD) { + if (bp->skip_left != 0 || bp->width <= MARGIN_NORMAL_THRESHOLD) { switch (bt_last) { case BT_EVEN: Draw<BM_NORMAL, RM_WITH_SKIP, BT_EVEN>(bp, zoom); return; case BT_ODD: Draw<BM_NORMAL, RM_WITH_SKIP, BT_ODD>(bp, zoom); return; @@ -388,7 +388,7 @@ void Blitter_32bppSSE4_Anim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, break; } case BM_COLOUR_REMAP: - if (bp->skip_left != 0 || bp->width <= MARGIN_THRESHOLD) { + if (bp->skip_left != 0 || bp->width <= MARGIN_REMAP_THRESHOLD) { Draw<BM_COLOUR_REMAP, RM_WITH_SKIP, BT_NONE>(bp, zoom); return; } else { Draw<BM_COLOUR_REMAP, RM_WITH_MARGIN, BT_NONE>(bp, zoom); return; diff --git a/src/blitter/32bpp_anim_sse4.hpp b/src/blitter/32bpp_anim_sse4.hpp index 90aec22d8..0f1131c88 100644 --- a/src/blitter/32bpp_anim_sse4.hpp +++ b/src/blitter/32bpp_anim_sse4.hpp @@ -17,8 +17,8 @@ #include "32bpp_anim.hpp" #include "32bpp_sse4.hpp" -#undef MARGIN_THRESHOLD -#define MARGIN_THRESHOLD 4 +#undef MARGIN_NORMAL_THRESHOLD +#define MARGIN_NORMAL_THRESHOLD 4 /** The SSE4 32 bpp blitter with palette animation. */ class Blitter_32bppSSE4_Anim FINAL : public Blitter_32bppAnim, public Blitter_32bppSSE_Base { |