diff --git a/.gitattributes b/.gitattributes index e3dbf9d..42782ff 100644 --- 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 deleted file mode 100644 index 3da7e7a..0000000 --- a/res/font/Blox2.ttf +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:afb140ce060bb40ebc47cf15a735493b5880d3020059181d512468fc0f7dc18e -size 108460 diff --git a/res/font/blox.txt b/res/font/blox.txt deleted file mode 100644 index 7e60cd8..0000000 --- a/res/font/blox.txt +++ /dev/null @@ -1,79 +0,0 @@ -___________________________ -BLOX Created by Brian Kent -¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ - -Thanks for Downloading Blox. -Here's how to use this font: - -'UPPERCASE' letters slant \ [pressing Shift] -'lowercase' letters slant / - - -To make the 'Numbers' slant \ press Shift + the 'Number' - -[--- SO for 0-9 slanting \, you would use )!@#$%^&*( ---] - - - -If you have any questions or comments, you can e-mail me at -aefonts[AT]frontiernet[DOT]net - -You can visit my Homepage <ÆNIGMA GAMES & FONTS> at -http://www.aenigmafonts.com/ - -____________ -!!! NOTE !!! -¯¯¯¯¯¯¯¯¯¯¯¯ -This font has been updated! I've edited the (BRK) in the font name -to just BRK. It seems that Adobe Illustrator and web pages with CSS -don't like fonts with ( and ) in their name. - -________________ -INSTALLING FONTS -¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ - There's a couple of ways to install Fonts. The 'easy' way to -install fonts is to just Unzip/place the font file [.ttf] into your -Windows\Fonts directory (I always use this method). If you're unable -to do it the 'easy' way, then try to do it this way (for Windows -95/98/NT): - -1] Unzip the Font(s) to a folder (or somewhere, just remember where -you unzipped it) on your Computer. - -2] Next, click on the START button, then select SETTINGS then -CONTROL PANEL. - -3] When the Control Panel Window pops up, Double Click on FONTS. - -4] When the FONTS window pops up, select File then Install New Font... - -5] A Add Fonts window will pop up, just go to the folder that you -unzipped the Font(s) to, select the Font(s) and then click on OK. -Now the Font(s) are installed. - - Now you can use the Font(s) in programs the utilize Fonts. Make -sure that you install the font(s) first, then open up your apps -(so the app will recognize the font). Sometimes you'll have to -wait until you computer 'auto-refreshes' for programs to recognize -fonts (Windows is sometimes slow to do that). You can refresh your -computer quicker by going into Windows Explorer -or- My Computer and -press F5 (or in the menubar select VIEW then REFRESH). - - -__________ -DISCLAIMER -¯¯¯¯¯¯¯¯¯¯ --The font(s) in this zip file were created by me (Brian Kent). All -of my Fonts are Freeware, you can use them any way you want to -(Personal use, Commercial use, or whatever). - --If you have a Font related site and would like to offer my fonts on -your site, go right ahead. All I ask is that you keep this text file -intact with the Font. - --You may not Sell or Distribute my Fonts for profit or alter the font -file(s) [.ttf .fon] in any way without asking me first. I can be -reached at: -aefonts[AT]frontiernet[DOT]net - -(make sure you replace the [AT] and [DOT] with the proper characters) . diff --git a/res/fonts/rc-rocket-font/RcRocketRegular-0WVW9.otf b/res/fonts/rc-rocket-font/RcRocketRegular-0WVW9.otf new file mode 100644 index 0000000..40231f3 --- /dev/null +++ b/res/fonts/rc-rocket-font/RcRocketRegular-0WVW9.otf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3058223d0c2ba69c39ab14b8739e2dfa280c0b3fa1e87d05c7de76a15b1b685 +size 18160 diff --git a/res/fonts/rc-rocket-font/info.txt b/res/fonts/rc-rocket-font/info.txt new file mode 100644 index 0000000..c38f06e --- /dev/null +++ b/res/fonts/rc-rocket-font/info.txt @@ -0,0 +1,2 @@ +license: Public Domain +link: https://www.fontspace.com/rc-rocket-font-f85241 \ No newline at end of file diff --git a/src/font.cc b/src/font.cc index 5337af0..2e07bbf 100644 --- 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 index 93fc4b1..0ff2848 100644 --- 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 index 21ff499..0586e23 100644 --- 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 index 853a28d..89f6d90 100644 --- 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_