Changeset 5929 for code/trunk/src/libraries/core/Resource.h

Timestamp:

Oct 12, 2009, 8:20:07 PM (16 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/Resource.h (modified) (3 diffs)

code/trunk/src/libraries/core/Resource.h

@@ -64 +64 @@
         // Docs by Ogre::ResourceGroupManager.h
     public:
-                /**
+        /**
         @brief
             Open a single resource by name and return a DataStream
@@ -81 +81 @@
             Shared pointer to data stream containing the data. Will be
             destroyed automatically when no longer referenced.
-                */
+        */
         static DataStreamPtr open(const std::string& name,
             const std::string& group = Resource::DEFAULT_GROUP,
             bool bSearchGroupsIfNotFound = false);
 
-                /**
+        /**
         @brief
             Open all resources matching a given pattern (which can contain
@@ -101 +101 @@
             Shared pointer to a data stream list , will be
             destroyed automatically when no longer referenced
-                */
+        */
         static DataStreamListPtr openMulti(const std::string& pattern, const std::string& group = Resource::DEFAULT_GROUP);