diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-01 12:15:38 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-01 12:16:32 +0200 |
| commit | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (patch) | |
| tree | f6b71cc2daa719c10c1ce31cf738e1c6ec934a73 /src/ui/displaytext.cpp | |
| parent | 0f2adf05fd2b2b38c2b84aa8d72b3fd756dcfcd4 (diff) | |
| parent | 1835d2ae580525603308206f7b8e6b4552b3ca0f (diff) | |
| download | colobot-d9fee8b2adad613cf8c10d153cd5cd7b261b7863.tar.gz colobot-d9fee8b2adad613cf8c10d153cd5cd7b261b7863.tar.bz2 colobot-d9fee8b2adad613cf8c10d153cd5cd7b261b7863.zip | |
Release 0.1.3-alpha
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. |