backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Fix use of TexText destructor by using shared pointers

Browse Source
This commit is contained in:
Mathieu Schroeter 2022-07-15 22:55:28 +02:00
parent fd31c67bbe
commit cb02c87542
No known key found for this signature in database
GPG Key ID: 8B9145A5FA9DA8A8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/text.cxx
View File

@ -51,16 +51,16 @@ struct TexText {
~TexText () ~TexText ()
{ {
/*SDL_DestroyTexture (this->outline); SDL_DestroyTexture (this->outline);
SDL_DestroyTexture (this->base); SDL_DestroyTexture (this->base);
SDL_DestroyTexture (this->over);*/ SDL_DestroyTexture (this->over);
} }
}; };
class Cache class Cache
{ {
private: private:
std::unordered_map<std::string, struct TexText> list; std::unordered_map<std::string, std::shared_ptr<struct TexText>> list;
public: public:
Cache () {} Cache () {}
@ -69,14 +69,16 @@ public:
{ {
const auto entry = this->list.find (text); const auto entry = this->list.find (text);
if (entry != this->list.end ()) if (entry != this->list.end ())
return &entry->second; return entry->second.get ();
return nullptr; return nullptr;
} }
void Insert (const std::string & text, const TexText & texText) void
Insert (const std::string & text, std::shared_ptr<struct TexText> texText)
{ {
this->list.insert (std::pair<std::string, struct TexText> (text, texText)); this->list.insert (
std::pair<std::string, std::shared_ptr<struct TexText>> (text, texText));
} }
}; };
@ -179,7 +181,8 @@ public:
if (!texText) if (!texText)
{ {
struct TexText _texText (texOutline, texBase, texOver); std::shared_ptr<struct TexText> _texText =
std::make_shared<struct TexText> (texOutline, texBase, texOver);
this->cache.Insert (pText, _texText); this->cache.Insert (pText, _texText);
} }
} }