diff --git a/CREDITS.md b/CREDITS.md index 841da4fc0..e46f8bc28 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -5,9 +5,6 @@ Programming Resources ========= -LinLibertine_R.ttf - The Libertine Font Project - http://www.linuxlibertine.org/ - PugiXML http://pugixml.org/ diff --git a/LinLibertine_R.ttf b/LinLibertine_R.ttf deleted file mode 100644 index ab154440d..000000000 Binary files a/LinLibertine_R.ttf and /dev/null differ diff --git a/src/Renderer_draw_gl.cpp b/src/Renderer_draw_gl.cpp index 683abfaa3..d1753463d 100644 --- a/src/Renderer_draw_gl.cpp +++ b/src/Renderer_draw_gl.cpp @@ -82,19 +82,13 @@ namespace Renderer { std::cout << "loading fonts..."; - std::string fontPath = "LinLibertine_R.ttf"; + std::string fontPath = Font::getDefaultPath(); //make sure our font exists if(!boost::filesystem::exists(fontPath)) { - //std::cout << "Default font \"" << fontPath << "\" does not exist! Attempting to default to a system font..."; - //fontPath = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"; - fontPath = Font::getDefaultPath(); - if(!boost::filesystem::exists(fontPath)) - { - std::cerr << "System font \"" << fontPath << "\" wasn't found either! Well, you're kind of screwed. Sorry.\n"; - return; - } + std::cerr << "System font \"" << fontPath << "\" wasn't found! Well, you're kind of screwed. Sorry. Report this to Aloshi, please.\n"; + return; } float fontSizes[] = {0.035, 0.045, 0.1}; diff --git a/src/components/GuiList.cpp b/src/components/GuiList.cpp index 3afedda40..9a85bf226 100644 --- a/src/components/GuiList.cpp +++ b/src/components/GuiList.cpp @@ -18,7 +18,7 @@ GuiList::GuiList(int offsetX, int offsetY, Font* font) mFont = font; mSelectorColor = 0x000000FF; - mSelectedTextColorOverride = 0x0000FF; + mSelectedTextColorOverride = 0x0000FFFF; mScrollSound = NULL; mDrawCentered = true;