Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 9, 2008, 4:44:36 PM (17 years ago)
Author:
landauf
Message:

merged core branch to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/Orxonox.h

    r790 r871  
    1414
    1515#include "OrxonoxPrereqs.h"
    16 #include "loader/LoaderPrereqs.h"
     16//#include "loader/LoaderPrereqs.h"
    1717#include "audio/AudioPrereqs.h"
    1818
     
    6969      GraphicsEngine*       ogre_;          //!< our dearest graphics engine <3
    7070      std::string           dataPath_;      //!< path to data
    71       loader::LevelLoader*  loader_;        //!< level loader builds the scene
     71//      loader::LevelLoader*  loader_;        //!< level loader builds the scene
    7272      audio::AudioManager*  auMan_;         //!< audio manager
    7373      BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
Note: See TracChangeset for help on using the changeset viewer.