diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-03 00:11:26 +0100 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-12-04 00:15:39 +0100 |
| commit | 8deb1305726966b3b583865dec1ba7ba1327d8cb (patch) | |
| tree | 291627fbe0123dc35c015b1f398585f204afe8ea /src/ui/displaytext.cpp | |
| parent | dae8d8738908a65a4ee4ef14d88681e196825126 (diff) | |
| download | colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.tar.gz colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.tar.bz2 colobot-8deb1305726966b3b583865dec1ba7ba1327d8cb.zip | |
Changed char[] to std::string in restext
Experimental changes
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. |