diff options
| author | rubidium <rubidium@openttd.org> | 2009-06-29 09:32:58 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-06-29 09:32:58 +0000 |
| commit | 5375b32aee2671cb7f0520aa2e90281ed465da51 (patch) | |
| tree | 2228c0a9a9abedd8645937add3f2c8d5014c2611 | |
| parent | b43a4f6787194f2267da9f9954fae5bddc34c318 (diff) | |
| download | openttd-5375b32aee2671cb7f0520aa2e90281ed465da51.tar.xz | |
(svn r16691) -Codechange: what's the point of getting the fifth dparam and then using that as the second dparam later on? Especially when the fifth dparam is never set and the second dparam is never used.
| -rw-r--r-- | src/texteff.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/texteff.cpp b/src/texteff.cpp index ef8ba25fc..c478578be 100644 --- a/src/texteff.cpp +++ b/src/texteff.cpp @@ -26,7 +26,6 @@ struct TextEffect { int32 bottom; uint16 duration; uint64 params_1; - uint64 params_2; TextEffectMode mode; }; @@ -84,7 +83,6 @@ TextEffectID AddTextEffect(StringID msg, int x, int y, uint16 duration, TextEffe te->y = y - 5; te->bottom = y + 5; te->params_1 = GetDParam(0); - te->params_2 = GetDParam(4); te->mode = mode; GetString(buffer, msg, lastof(buffer)); @@ -106,7 +104,6 @@ void UpdateTextEffect(TextEffectID te_id, StringID msg) te = &_text_effect_list[te_id]; te->string_id = msg; te->params_1 = GetDParam(0); - te->params_2 = GetDParam(4); /* Update width of text effect */ char buffer[100]; @@ -171,7 +168,7 @@ void DrawTextEffects(DrawPixelInfo *dpi) dpi->left + dpi->width > te->x && dpi->top + dpi->height > te->y) { if (te->mode == TE_RISING || (_settings_client.gui.loading_indicators && !IsTransparencySet(TO_LOADING))) { - AddStringToDraw(te->x, te->y, te->string_id, te->params_1, te->params_2); + AddStringToDraw(te->x, te->y, te->string_id, te->params_1, INVALID_STRING_ID); } } } @@ -186,7 +183,7 @@ void DrawTextEffects(DrawPixelInfo *dpi) dpi->left + dpi->width > te->x && dpi->top + dpi->height > te->y) { if (te->mode == TE_RISING || (_settings_client.gui.loading_indicators && !IsTransparencySet(TO_LOADING))) { - AddStringToDraw(te->x, te->y, (StringID)(te->string_id - 1), te->params_1, te->params_2); + AddStringToDraw(te->x, te->y, (StringID)(te->string_id - 1), te->params_1, INVALID_STRING_ID); } } } |