Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/gui/gl/glgui_widget.cc
- Timestamp:
- Sep 26, 2006, 4:59:49 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/lib/gui/gl/glgui_widget.cc
r9715 r9833 25 25 26 26 #include "loading/load_param.h" 27 28 /// TODO TAKE THIS OUT OF HERE 29 #include "loading/resource_manager.h" 27 #include "loading/new_resource_manager.h" 30 28 31 29 namespace OrxGui … … 104 102 105 103 if(GLGuiWidget::_defaultFont == NULL) 106 GLGuiWidget::_defaultFont = new Font(Resource Manager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);104 GLGuiWidget::_defaultFont = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/final_frontier.ttf", 20); 107 105 108 106 this->_font = *GLGuiWidget::_defaultFont;
Note: See TracChangeset
for help on using the changeset viewer.