Change Blox 2 font to a much more readible RC Rocket

https://www.fontspace.com/rc-rocket-font-f85241
mattmaniak · Aug 8, 2024 · ad73622 · ad73622
1 parent 5d06263
commit ad73622
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 86 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 *.bmp filter=lfs diff=lfs merge=lfs -text
 *.dll filter=lfs diff=lfs merge=lfs -text
+*.otf filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
diff --git a/res/font/Blox2.ttf b/res/font/Blox2.ttf
diff --git a/res/font/blox.txt b/res/font/blox.txt
diff --git a/res/fonts/rc-rocket-font/RcRocketRegular-0WVW9.otf b/res/fonts/rc-rocket-font/RcRocketRegular-0WVW9.otf
diff --git a/res/fonts/rc-rocket-font/info.txt b/res/fonts/rc-rocket-font/info.txt
@@ -0,0 +1,2 @@
+license: Public Domain
+link: https://www.fontspace.com/rc-rocket-font-f85241
diff --git a/src/font.cc b/src/font.cc
@@ -7,7 +7,7 @@ Font::Font(
     std::string passed_text,
     const unsigned int passed_size):
     size(passed_size * Graphics.pixelart_px_size_),
-    name_(FONT_NAME),
+    name_("rc-rocket-font" + std::string(SEPARATOR) + FONT_NAME),
     text_(passed_text) {
   const std::string path = FONT_PATH + SEPARATOR + name_;
   SDL_Surface*      surface;

diff --git a/src/font.h b/src/font.h
@@ -16,7 +16,7 @@
 #include "graphics.h"
 #include "os_env.h"
 
-#define FONT_NAME "Blox2.ttf"
+#define FONT_NAME "RcRocketRegular-0WVW9.otf"
 
 class Font {
  public:

diff --git a/src/menu.cc b/src/menu.cc
@@ -195,7 +195,7 @@ Credits_menu::Credits_menu(Graphics& graphics): Menu(graphics) {
     text_lines_.push_back(new Font(graphics, "Programming", TEXT_FONT_SZ));
     text_lines_.push_back(new Font(graphics, "mattmaniak", TEXT_FONT_SZ));
     text_lines_.push_back(new Font(graphics, "Graphics", TEXT_FONT_SZ));
-    text_lines_.push_back(new Font(graphics, "Jakub QooBooS Mieszczak",
+    text_lines_.push_back(new Font(graphics, "Jakub \"QooBooS\" Mieszczak",
                                    TEXT_FONT_SZ));
 
     // Center the lines.

diff --git a/src/os_env.h b/src/os_env.h
@@ -36,7 +36,7 @@ const char SEPARATOR[] = "\\";
 #define HITBOXES_PATH RESOURCES_PATH + std::string(SEPARATOR) + "hitboxes" \
         + std::string(SEPARATOR)
 
-#define FONT_PATH RESOURCES_PATH + std::string(SEPARATOR) + "font" \
+#define FONT_PATH RESOURCES_PATH + std::string(SEPARATOR) + "fonts" \
         + std::string(SEPARATOR)
 
 #endif  // SRC_OS_ENV_H_
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		license: Public Domain
		link: https://www.fontspace.com/rc-rocket-font-f85241