diff options
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | assets/FanwoodText.otf | bin | 127932 -> 0 bytes | |||
| -rw-r--r-- | assets/Roboto-Medium.ttf | bin | 0 -> 162588 bytes | |||
| -rw-r--r-- | src/game/interface.cpp | 4 | ||||
| -rw-r--r-- | src/render.cpp | 2 |
5 files changed, 4 insertions, 4 deletions
@@ -36,6 +36,6 @@ assets/units/spider/*.ogg The following assets were made by various other authors: FILE AUTHOR LICENSE -assets/FanwoodText.otf Barry Schwartz MIT +assets/Roboto-Medium.ttf Google Apache License 2.0 assets/fx/explosion.ogg cydon at freesound.org CC0 assets/fx/water_splash.ogg Rocktopus at freesound.org CC-BY
\ No newline at end of file diff --git a/assets/FanwoodText.otf b/assets/FanwoodText.otf Binary files differdeleted file mode 100644 index 73d559f..0000000 --- a/assets/FanwoodText.otf +++ /dev/null diff --git a/assets/Roboto-Medium.ttf b/assets/Roboto-Medium.ttf Binary files differnew file mode 100644 index 0000000..39c63d7 --- /dev/null +++ b/assets/Roboto-Medium.ttf diff --git a/src/game/interface.cpp b/src/game/interface.cpp index 00cdd7b..8cc2a85 100644 --- a/src/game/interface.cpp +++ b/src/game/interface.cpp @@ -436,11 +436,11 @@ void state_t::render_to(render::state_t *render) window->setView(sf::View(sf::FloatRect(0, 0, w, h))); - em = std::max(w, h) * 0.017; + em = std::max(w, h) * 0.013; if (em < 15.0f) em = 15.0f; - avatar_size = v2f_t(6, 10); + avatar_size = v2f_t(3.0f/5.0f, 1.0f) * 14.0f; if (game->selected_units.size() > 8) large_avatars = false; diff --git a/src/render.cpp b/src/render.cpp index 5a03e94..0840c9a 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -29,7 +29,7 @@ state_t::state_t(sf::RenderWindow *window_) { window = window_; - font.loadFromFile("assets/FanwoodText.otf"); + font.loadFromFile("assets/Roboto-Medium.ttf"); window->clear(); render_text(v2f_t(0, 0), 50, "Loading...", ALIGN_LEFT_TOP, sf::Color::White); |