diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
| commit | 77bd13f49fb974cb50918b18d166ab61240c0d34 (patch) | |
| tree | 2a824960ef146e23ca772c8dc0215e70f586ed8f /src/old/text.cpp | |
| parent | 6a059b437dca706a72233a57ba4c22011aba6dde (diff) | |
| parent | c2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff) | |
| download | colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2 colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip | |
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/old/text.cpp')
| -rw-r--r-- | src/old/text.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/old/text.cpp b/src/old/text.cpp index d174358..8573816 100644 --- a/src/old/text.cpp +++ b/src/old/text.cpp @@ -130,7 +130,7 @@ static short table_text_colobot[] = 218,17, 227,33, // Y 227,17, 236,33, // Z 236,17, 241,33, // [ - 241,17, 248,33, // \ + 241,17, 248,33, // \ 248,17, 252,33, // ] 219,0, 229,16, // ^ 0, 34, 9, 50, // _ @@ -166,7 +166,7 @@ static short table_text_colobot[] = 201,34, 203,50, // | 203,34, 209,50, // } 209,34, 219,50, // ~ - 219,34, 228,50, // + 219,34, 228,50, // 219,34, 225,50, // 128 219,34, 225,50, @@ -1223,7 +1223,7 @@ void CText::DimText(char *string, char *format, int len, Math::Point pos, start.y -= RetDescent(size, FONT_COLOBOT); end.y += RetAscent(size, FONT_COLOBOT); } - + // Returns the size of a multi-font text. void CText::DimText(char *string, char *format, Math::Point pos, int justif, @@ -1259,7 +1259,7 @@ void CText::DimText(char *string, int len, Math::Point pos, int justif, start.y -= RetDescent(size, font); end.y += RetAscent(size, font); } - + // Returns the size of a text. void CText::DimText(char *string, Math::Point pos, int justif, @@ -1291,7 +1291,7 @@ float CText::RetHeight(float size, FontType font) return (16.0f/256.0f)*(size/20.0f); } - + // Returns the width of a string of multi-font characters. float CText::RetStringWidth(char *string, char *format, int len, |