Changeset 6194 for code/branches/presentation2

Timestamp:

Dec 2, 2009, 1:34:55 PM (15 years ago)

Author:

dafrick

Message:

Some adjustments regarding tolua export and sound menu.

Location:

code/branches/presentation2/src

Files:

• libraries/core/CMakeLists.txt (modified) (1 diff)
• libraries/core/ConfigFileManager.h (modified) (3 diffs)
• orxonox/sound/SoundManager.h (modified) (1 diff)

code/branches/presentation2/src/libraries/core/CMakeLists.txt

@@ -86 +86 @@
   TOLUA_FILES
     CommandExecutor.h
+      ConfigFileManager.h
     Game.h
     Loader.h

code/branches/presentation2/src/libraries/core/ConfigFileManager.h

@@ -40 +40 @@
 #include "util/Singleton.h"
 
+// tolua_begin
 namespace orxonox
 {
+    // tolua_end
     // Use int as config file type to have an arbitrary number of files
     struct ConfigFileType : OrxEnum<ConfigFileType>
@@ -54 +56 @@
     };
 
-    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value);
+    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value); // tolua_export
     _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
     _CoreExport void reloadConfig();
@@ -319 +321 @@
             static ConfigFileManager* singletonPtr_s;
     };
-}
+} // tolua_export
 
 #endif /* _ConfigFileManager_H__ */

code/branches/presentation2/src/orxonox/sound/SoundManager.h

@@ -80 +80 @@
         void pauseAmbientSound(AmbientSound* ambient);
         
-        void setVolume(float vol, SoundType::Value type); // tolua_export
+        void setVolume(float vol, SoundType::Value type);
         float getVolume(SoundType::Value type); // tolua_export