Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 30, 2009, 2:22:00 AM (16 years ago)
Author:
rgrieder
Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/src/core/Core.h

    r5693 r5695  
    5151{
    5252    class CoreConfiguration;
    53     using boost::scoped_ptr;
    5453
    5554    /**
    … …  
    5756        The Core class is a singleton used to configure the program basics.
    5857    @details
    59         The class provides information about the media, config and log path.
     58        The class provides information about the data, config and log path.
    6059        It determines those by the use of platform specific functions.
    6160    @remark
    … …  
    6665        typedef Loki::ScopeGuardImpl0<void (*)()> SimpleScopeGuard;
    6766        friend class Singleton<Core>;
     67        friend class Game;
    6868
    6969        public:
    … …  
    8080            void setConfigValues();
    8181
    82             bool preUpdate(const Clock& time) throw();
    83             bool postUpdate(const Clock& time) throw();
    84 
    85             void loadGraphics();
    86             void unloadGraphics();
    87 
    8882            static int   getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
    8983            static void  setSoftDebugLevel(OutputHandler::OutputDevice device, int level);
    … …  
    9185            static void  resetLanguage();
    9286
    93             static void tsetMediaPath(const std::string& path);
    94             //! Returns the path to the config files as boost::filesystem::path
    95             static const boost::filesystem::path& getMediaPath();
     87            static void tsetExternalDataPath(const std::string& path);
     88            //! Returns the path to the data files as boost::filesystem::path
     89            static const boost::filesystem::path& getDataPath();
     90            //! Returns the path to the external data files as boost::filesystem::path
     91            static const boost::filesystem::path& getExternalDataPath();
    9692            //! Returns the path to the config files as boost::filesystem::path
    9793            static const boost::filesystem::path& getConfigPath();
    … …  
    10197            static const boost::filesystem::path& getRootPath();
    10298            //! Returns the path to the data files as std::string
    103             static std::string getMediaPathString();
     99            static std::string getDataPathString();
     100            //! Returns the path to the external data files as std::string
     101            static std::string getExternalDataPathString();
    104102            //! Returns the path to the config files as std::string
    105103            static std::string getConfigPathString();
    … …  
    113111        private:
    114112            Core(const Core&); //!< Don't use (undefined symbol)
     113
     114            void preUpdate(const Clock& time);
     115            void postUpdate(const Clock& time);
     116
     117            void loadGraphics();
     118            void unloadGraphics();
    115119
    116120            void setFixedPaths();
    … …  
    126130            scoped_ptr<Language>          languageInstance_;
    127131            scoped_ptr<CoreConfiguration> configuration_;
    128             scoped_ptr<LuaBind>           luaBind_;
    129132            scoped_ptr<TclBind>           tclBind_;
    130133            scoped_ptr<TclThreadManager>  tclThreadManager_;
Note: See TracChangeset for help on using the changeset viewer.