Skip to content

Commit

Permalink
Obey astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
alef committed Aug 24, 2024
1 parent 0abbaed commit 0615d55
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/cata_imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static int GetFallbackCharWidth( ImWchar c, const float scale )

void cataimgui::client::load_fonts( const Font_Ptr &cata_font,
const std::array<SDL_Color, color_loader<SDL_Color>::COLOR_NAMES_COUNT> &windowsPalette,
const std::vector<std::string> &typefaces)
const std::vector<std::string> &typefaces )
{
ImGuiIO &io = ImGui::GetIO();
if( ImGui::GetIO().FontDefault == nullptr ) {
Expand Down
2 changes: 1 addition & 1 deletion src/cata_imgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class client
const GeometryRenderer_Ptr &sdl_geometry );
void load_fonts( const std::unique_ptr<Font> &cata_fonts,
const std::array<SDL_Color, color_loader<SDL_Color>::COLOR_NAMES_COUNT> &windowsPalette,
const std::vector<std::string> &typeface);
const std::vector<std::string> &typeface );
#endif
~client();

Expand Down
2 changes: 1 addition & 1 deletion src/sdltiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3728,7 +3728,7 @@ void catacurses::init_interface()
windowsPalette, fl.overmap_typeface, fl.overmap_fontsize, fl.fontblending );
stdscr = newwin( get_terminal_height(), get_terminal_width(), point_zero );
//newwin calls `new WINDOW`, and that will throw, but not return nullptr.
imclient->load_fonts( font, windowsPalette, fl.typeface);
imclient->load_fonts( font, windowsPalette, fl.typeface );
#if defined(__ANDROID__)
// Make sure we initialize preview_terminal_width/height to sensible values
preview_terminal_width = TERMINAL_WIDTH * fontwidth;
Expand Down

0 comments on commit 0615d55

Please sign in to comment.