Changeset 6190
- Timestamp:
- Dec 2, 2009, 9:02:49 AM (15 years ago)
- Location:
- code/branches/presentation2/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/libraries/core/GUIManager.cc
r6183 r6190 56 56 #include "ConsoleCommand.h" 57 57 #include "Core.h" 58 #include "input/InputManager.h"59 58 #include "LuaState.h" 60 59 #include "PathConfig.h" -
code/branches/presentation2/src/libraries/core/LuaState.cc
r6150 r6190 92 92 sourceInfo = Resource::getInfo(filename, resourceGroup); 93 93 94 // Continue search if not explicit ely forbidden94 // Continue search if not explicitly forbidden 95 95 if (bSearchOtherPaths && sourceInfo == NULL) 96 96 { … … 140 140 void LuaState::doString(const std::string& code, const shared_ptr<ResourceInfo>& sourceFileInfo) 141 141 { 142 // Save the o old source file info142 // Save the old source file info 143 143 shared_ptr<ResourceInfo> oldSourceFileInfo = sourceFileInfo_; 144 144 // Only override if sourceFileInfo provides useful information -
code/branches/presentation2/src/libraries/core/Shell.cc
r6180 r6190 66 66 ConfigFileManager::getInstance().setFilename(this->commandHistoryConfigFileType_, "commandHistory.ini"); 67 67 68 // Use a stringstream object to buffer the output and get it line by line in update()68 // Use a stringstream object to buffer the output 69 69 this->outputStream_ = &this->outputBuffer_; 70 70 -
code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h
r5929 r6190 60 60 61 61 //! Returns the currently selected KeyBinder 62 KeyBinder* 62 KeyBinder* getCurrent() 63 63 { return this->currentBinder_; } 64 64 //! Like getCurrent(), but returns it as InputHandler* (so you don't have to include KeyBinder.h) … … 68 68 69 69 //! Returns the default KeyBinder 70 KeyBinder* 70 KeyBinder* getDefault() 71 71 { return binders_[this->defaultFilename_]; } 72 72 //! Returns the default KeyBinder as InputHandler* (so you don't have to include KeyBinder.h) … … 80 80 81 81 //! Returns a pointer to a KeyBinder (creates it if not yet loaded) 82 KeyBinder* 82 KeyBinder* get(const std::string& name); 83 83 //! Like get() but return value is of type InputHandler* (so you don't have to include KeyBinder.h) 84 84 InputHandler* getAsHandler(const std::string& name); 85 85 86 86 //! Loads a KeyBinder by creating it (no different from get() except for the return value) 87 void load 87 void load(const std::string& filename); 88 88 //! Destroys a KeyBinder completely (does nothing if not yet loaded) 89 89 void unload(const std::string& filename); -
code/branches/presentation2/src/orxonox/sound/BaseSound.cc
r6188 r6190 55 55 assert(this->audioSource_ != 0); 56 56 } 57 58 57 } 59 58 -
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6186 r6190 504 504 } 505 505 } 506 507 506 }
Note: See TracChangeset
for help on using the changeset viewer.