Changeset 8858 for code/trunk/src/libraries/core/input/KeyBinderManager.cc
- Timestamp:
- Aug 23, 2011, 12:45:53 AM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:ignore
-
old new 1 1 build 2 2 codeblocks 3 vs 3 4 dependencies
-
- Property svn:mergeinfo changed
/code/branches/output (added) merged: 8739-8740,8765,8771-8772,8774-8780,8787-8789,8794-8799,8801,8803-8812,8814,8816-8817,8820,8822,8825-8837,8840,8844,8846,8848-8850,8853-8854
- Property svn:ignore
-
code/trunk/src/libraries/core/input/KeyBinderManager.cc
r7284 r8858 29 29 #include "KeyBinderManager.h" 30 30 31 #include "util/ Debug.h"31 #include "util/Output.h" 32 32 #include "util/Exception.h" 33 33 #include "util/ScopedSingletonManager.h" … … 168 168 if (!this->bBinding_) 169 169 { 170 COUT(0) << "Press any button/key or move a mouse/joystick axis" << std::endl;170 orxout(message) << "Press any button/key or move a mouse/joystick axis" << endl; 171 171 KeyDetector::getInstance().setCallback(createFunctor(&KeyBinderManager::keybindKeyPressed, this)); 172 172 InputManager::getInstance().enterState("detector"); … … 185 185 if (keyName == "Keys.KeyEscape") 186 186 { 187 COUT(0) << "Keybinding aborted." << std::endl;187 orxout(message) << "Keybinding aborted." << endl; 188 188 } 189 189 else 190 190 { 191 COUT(0) << "Binding string \"" << command_ << "\" on key '" << keyName << "'" << std::endl;191 orxout(message) << "Binding string \"" << command_ << "\" on key '" << keyName << "'" << endl; 192 192 this->currentBinder_->setBinding(command_, keyName, bTemporary_); 193 193 }
Note: See TracChangeset
for help on using the changeset viewer.