Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6194 for code


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/src/libraries/core/CMakeLists.txt

    r6150 r6194  
    8686  TOLUA_FILES
    8787    CommandExecutor.h
     88      ConfigFileManager.h
    8889    Game.h
    8990    Loader.h
  • code/branches/presentation2/src/libraries/core/ConfigFileManager.h

    r6105 r6194  
    4040#include "util/Singleton.h"
    4141
     42// tolua_begin
    4243namespace orxonox
    4344{
     45    // tolua_end
    4446    // Use int as config file type to have an arbitrary number of files
    4547    struct ConfigFileType : OrxEnum<ConfigFileType>
     
    5456    };
    5557
    56     _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value);
     58    _CoreExport bool config(const std::string& classname, const std::string& varname, const std::string& value); // tolua_export
    5759    _CoreExport bool tconfig(const std::string& classname, const std::string& varname, const std::string& value);
    5860    _CoreExport void reloadConfig();
     
    319321            static ConfigFileManager* singletonPtr_s;
    320322    };
    321 }
     323} // tolua_export
    322324
    323325#endif /* _ConfigFileManager_H__ */
  • code/branches/presentation2/src/orxonox/sound/SoundManager.h

    r6186 r6194  
    8080        void pauseAmbientSound(AmbientSound* ambient);
    8181       
    82         void setVolume(float vol, SoundType::Value type); // tolua_export
     82        void setVolume(float vol, SoundType::Value type);
    8383        float getVolume(SoundType::Value type); // tolua_export
    8484       
Note: See TracChangeset for help on using the changeset viewer.