summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-07-19 16:05:29 +0000
committerrubidium <rubidium@openttd.org>2010-07-19 16:05:29 +0000
commite38f503ec03f1bdd6f81ece65c6dca56ded2d935 (patch)
tree0717fc5d617415145b0bd6670e05b331a4f68e2f
parent3bb544e54d45d71dee6418c5462137c67a4ea698 (diff)
downloadopenttd-e38f503ec03f1bdd6f81ece65c6dca56ded2d935.tar.xz
(svn r20185) -Codechange: reduce the scope of _palette_animation_counter
-rw-r--r--src/gfx.cpp16
-rw-r--r--src/openttd.cpp1
-rw-r--r--src/variables.h3
3 files changed, 10 insertions, 10 deletions
diff --git a/src/gfx.cpp b/src/gfx.cpp
index a0373cfa8..44d44a757 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -1212,11 +1212,15 @@ void GfxInitPalettes()
_pal_count_dirty = 256;
}
-#define EXTR(p, q) (((uint16)(_palette_animation_counter * (p)) * (q)) >> 16)
-#define EXTR2(p, q) (((uint16)(~_palette_animation_counter * (p)) * (q)) >> 16)
+#define EXTR(p, q) (((uint16)(palette_animation_counter * (p)) * (q)) >> 16)
+#define EXTR2(p, q) (((uint16)(~palette_animation_counter * (p)) * (q)) >> 16)
void DoPaletteAnimations()
{
+ /* Animation counter for the palette animation. */
+ static int palette_animation_counter = 0;
+ palette_animation_counter += 8;
+
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
const Colour *s;
const ExtraPaletteValues *ev = &_extra_palette_values;
@@ -1226,12 +1230,12 @@ void DoPaletteAnimations()
const int colour_rotation_amount = (_use_palette == PAL_DOS) ? PALETTE_ANIM_SIZE_DOS : PALETTE_ANIM_SIZE_WIN;
Colour old_val[PALETTE_ANIM_SIZE_DOS];
const int oldval_size = colour_rotation_amount * sizeof(*old_val);
- const uint old_tc = _palette_animation_counter;
+ const uint old_tc = palette_animation_counter;
uint i;
uint j;
if (blitter != NULL && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
- _palette_animation_counter = 0;
+ palette_animation_counter = 0;
}
Colour *palette_pos = &_cur_palette[PALETTE_ANIM_SIZE_START]; // Points to where animations are taking place on the palette
@@ -1277,7 +1281,7 @@ void DoPaletteAnimations()
/* Radio tower blinking */
{
- byte i = (_palette_animation_counter >> 1) & 0x7F;
+ byte i = (palette_animation_counter >> 1) & 0x7F;
byte v;
if (i < 0x3f) {
@@ -1337,7 +1341,7 @@ void DoPaletteAnimations()
}
if (blitter != NULL && blitter->UsePaletteAnimation() == Blitter::PALETTE_ANIMATION_NONE) {
- _palette_animation_counter = old_tc;
+ palette_animation_counter = old_tc;
} else {
if (memcmp(old_val, &_cur_palette[PALETTE_ANIM_SIZE_START], oldval_size) != 0) {
/* Did we changed anything on the palette? Seems so. Mark it as dirty */
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 808f8a3e7..b6d20e937 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1323,7 +1323,6 @@ void GameLoop()
extern int _caret_timer;
_caret_timer += 3;
- _palette_animation_counter += 8;
CursorTick();
#ifdef ENABLE_NETWORK
diff --git a/src/variables.h b/src/variables.h
index a7b915120..28181d094 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -19,9 +19,6 @@
/* Amount of game ticks */
VARDEF uint16 _tick_counter;
-/* NOSAVE: Used in palette animations only, not really important. */
-VARDEF int _palette_animation_counter;
-
VARDEF uint32 _realtime_tick;
VARDEF byte _display_opt;