diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2016-02-23 23:12:05 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2016-02-23 23:12:05 +0100 |
| commit | 6585a5b6a4917331dec7686b8dd5efd2cae3393b (patch) | |
| tree | 405d8c3344237ce19d9c2340cedf53b46b57c11c /src/display.h | |
| parent | cefc03d92aa34622424c675c16eca56da8c9f135 (diff) | |
display: Rename active_anim to current_anim to avoid name clash
Diffstat (limited to 'src/display.h')
| -rw-r--r-- | src/display.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/display.h b/src/display.h index 8e1cca1..3a526b2 100644 --- a/src/display.h +++ b/src/display.h @@ -60,7 +60,7 @@ typedef struct animation animation_t; */ class Display { private: - animation_t *active_anim; + animation_t *current_anim; uint8_t need_update; uint8_t active_col; uint8_t disp_buf[8]; @@ -106,7 +106,7 @@ class Display { /** * Update display content. - * Checks active_anim->speed and active_anim->type and scrolls + * Checks current_anim->speed and current_anim->type and scrolls * the text / advances a frame when appropriate. Does nothing * otherwise. */ |