0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

C-style cast cleanup.

Browse source
This commit is contained in:
Mark de Wever 2007-08-26 22:00:02 +00:00
parent f0c6a6ff05
commit e167ceca28
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/marked-up_text.cpp
View file

@ -326,7 +326,9 @@ std::string word_wrap_text(const std::string& unwrapped_text, int font_size, int
if(start_of_line) {
line_width = 0;
format_string = "";
while(ch != end && *ch < (wchar_t)0x100 && is_format_char(*ch) && !ch.next_is_end()) {
while(ch != end && *ch < static_cast<wchar_t>(0x100)
&& is_format_char(*ch) && !ch.next_is_end()) {
format_string.append(ch.substr().first, ch.substr().second);
++ch;
}
@ -378,9 +380,10 @@ std::string word_wrap_text(const std::string& unwrapped_text, int font_size, int
line_width += word_width;
if((long)line_width > max_width) {
if((long)word_width > max_width) {
cut_word(current_line, current_word, font_sz, style, max_width);
if(static_cast<long>(line_width) > max_width) {
if(static_cast<long>(word_width) > max_width) {
cut_word(current_line,
current_word, font_sz, style, max_width);
}
if(current_word == " ")
current_word = "";