Browse Source

🐛 Do not render text as UTF8 for now

pull/1783/head
Anders Jenbo 5 years ago
parent
commit
c66604c7ad
  1. 4
      Source/DiabloUI/progress.cpp
  2. 4
      Source/DiabloUI/ttf_render_wrapped.cpp

4
Source/DiabloUI/progress.cpp

@ -39,8 +39,8 @@ void ProgressLoad(const char *msg)
SDL_Color color = { 243, 243, 243, 0 };
SDL_Color black = { 0, 0, 0, 0 };
msgSurface = TTF_RenderUTF8_Solid(font, msg, color);
msgShadow = TTF_RenderUTF8_Solid(font, msg, black);
msgSurface = TTF_RenderText_Solid(font, msg, color);
msgShadow = TTF_RenderText_Solid(font, msg, black);
}
SDL_Rect rect3 = { (Sint16)(PANEL_LEFT + 265), (Sint16)(UI_OFFSET_Y + 267), SML_BUTTON_WIDTH, SML_BUTTON_HEIGHT };
vecProgress.push_back(new UiButton(&SmlButton, _("Cancel"), &DialogActionCancel, rect3, 0));

4
Source/DiabloUI/ttf_render_wrapped.cpp

@ -120,7 +120,7 @@ SDL_Surface *RenderUTF8_Solid_Wrapped(TTF_Font *font, const char *text, SDL_Colo
if (strLines == nullptr) {
SDL_stack_free(str);
return TTF_RenderUTF8_Solid(font, text, fg);
return TTF_RenderText_Solid(font, text, fg);
}
/* Create the target surface */
@ -151,7 +151,7 @@ SDL_Surface *RenderUTF8_Solid_Wrapped(TTF_Font *font, const char *text, SDL_Colo
dest.y += lineskip;
continue;
}
SDL_Surface *tmp = TTF_RenderUTF8_Solid(font, text, fg);
SDL_Surface *tmp = TTF_RenderText_Solid(font, text, fg);
if (tmp == nullptr) {
Log("{}", TTF_GetError());
SDL_FreeSurface(textbuf);

Loading…
Cancel
Save