Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Sep 26, 2006, 4:59:49 PM (18 years ago)
Author:
bensch
Message:

orxonox/new_class_id: almost killed off the old ResourceManager

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

    r9715 r9833  
    2525
    2626#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"
    3028
    3129namespace OrxGui
     
    104102
    105103    if(GLGuiWidget::_defaultFont == NULL)
    106       GLGuiWidget::_defaultFont = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/final_frontier.ttf", 20);
     104      GLGuiWidget::_defaultFont = new Font(Resources::NewResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/final_frontier.ttf", 20);
    107105
    108106    this->_font = *GLGuiWidget::_defaultFont;
Note: See TracChangeset for help on using the changeset viewer.