diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-20 20:20:20 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-20 20:22:51 +0100 |
| commit | 3966e3fce01df0fabee8caca752519fb7686263b (patch) | |
| tree | e91fe04953b4d0a3bff32ad8dc48c7dd37d57d1d /src/ui/displaytext.cpp | |
| parent | fe3f9ea38cfae89fdd83d4c3fe79ea355f50bce9 (diff) | |
| parent | d9283e2afa4cea4790bbcaf4fec3e645d15452b2 (diff) | |
| download | colobot-3966e3fce01df0fabee8caca752519fb7686263b.tar.gz colobot-3966e3fce01df0fabee8caca752519fb7686263b.tar.bz2 colobot-3966e3fce01df0fabee8caca752519fb7686263b.zip | |
Merge branch 'dev-string-in-restext' into dev
Merging branches after code review
This should fix buffer overflow problems with translation strings
Diffstat (limited to 'src/ui/displaytext.cpp')
| -rw-r--r-- | src/ui/displaytext.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index d88674a..5b3144d 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -127,9 +127,6 @@ void CDisplayText::DisplayError(Error err, CObject* pObj, float time) void CDisplayText::DisplayError(Error err, Math::Vector goal, float height, float dist, float time) { - TextType type; - char text[100]; - if ( err == ERR_OK ) return; #if 0 @@ -148,7 +145,7 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height, type = TT_WARNING; } #else - type = TT_WARNING; + TextType type = TT_WARNING; if ( err >= INFO_FIRST ) { type = TT_INFO; @@ -164,8 +161,9 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height, } #endif + std::string text; GetResource(RES_ERR, err, text); - DisplayText(text, goal, height, dist, time, type); + DisplayText(text.c_str(), goal, height, dist, time, type); } // Displays text. |