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

Maintain free list for text effect entries

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-10-04 18:32:18 +01:00
parent 627cdf83eb
commit ac5139343a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/texteff.cpp
View File

@@ -20,6 +20,9 @@
#include "safeguards.h" #include "safeguards.h"
static std::vector<struct TextEffect> _text_effects; ///< Text effects are stored there
static TextEffectID _free_text_effect = 0;
/** Container for all information about a text effect */ /** Container for all information about a text effect */
struct TextEffect : public ViewportSign { struct TextEffect : public ViewportSign {
uint64 params_1; ///< DParam parameter uint64 params_1; ///< DParam parameter
@@ -34,21 +37,23 @@ struct TextEffect : public ViewportSign {
this->MarkDirty(); this->MarkDirty();
this->width_normal = 0; this->width_normal = 0;
this->string_id = INVALID_STRING_ID; this->string_id = INVALID_STRING_ID;
this->params_1 = _free_text_effect;
_free_text_effect = this - _text_effects.data();
} }
}; };
static std::vector<struct TextEffect> _text_effects; ///< Text effects are stored there
/* Text Effects */ /* Text Effects */
TextEffectID AddTextEffect(StringID msg, int center, int y, uint8 duration, TextEffectMode mode) TextEffectID AddTextEffect(StringID msg, int center, int y, uint8 duration, TextEffectMode mode)
{ {
if (_game_mode == GM_MENU) return INVALID_TE_ID; if (_game_mode == GM_MENU) return INVALID_TE_ID;
TextEffectID i; TextEffectID i = _free_text_effect;
for (i = 0; i < _text_effects.size(); i++) { if (i == _text_effects.size()) {
if (_text_effects[i].string_id == INVALID_STRING_ID) break; _text_effects.emplace_back();
_free_text_effect++;
} else {
_free_text_effect = _text_effects[i].params_1;
} }
if (i == _text_effects.size()) _text_effects.emplace_back();
TextEffect &te = _text_effects[i]; TextEffect &te = _text_effects[i];
@@ -109,6 +114,7 @@ void InitTextEffects()
{ {
_text_effects.clear(); _text_effects.clear();
_text_effects.shrink_to_fit(); _text_effects.shrink_to_fit();
_free_text_effect = 0;
} }
void DrawTextEffects(DrawPixelInfo *dpi) void DrawTextEffects(DrawPixelInfo *dpi)