Changeset 1001 for code/branches/core2/src/orxonox/core
- Timestamp:
- Apr 8, 2008, 1:51:25 AM (17 years ago)
- Location:
- code/branches/core2/src/orxonox/core
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core2/src/orxonox/core/CommandExecutor.cc
r994 r1001 297 297 } 298 298 299 boolCommandExecutor::addConsoleCommandShortcut(ExecutorStatic* executor)299 Executor& CommandExecutor::addConsoleCommandShortcut(ExecutorStatic* executor) 300 300 { 301 301 CommandExecutor::getInstance().consoleCommandShortcuts_[executor->getName()] = executor; 302 302 CommandExecutor::getInstance().consoleCommandShortcuts_LC_[getLowercase(executor->getName())] = executor; 303 return true;303 return (*executor); 304 304 } 305 305 -
code/branches/core2/src/orxonox/core/CommandExecutor.h
r994 r1001 139 139 static CommandEvaluation evaluate(const std::string& command); 140 140 141 static booladdConsoleCommandShortcut(ExecutorStatic* executor);141 static Executor& addConsoleCommandShortcut(ExecutorStatic* executor); 142 142 static ExecutorStatic* getConsoleCommandShortcut(const std::string& name); 143 143 static ExecutorStatic* getLowercaseConsoleCommandShortcut(const std::string& name); -
code/branches/core2/src/orxonox/core/ConsoleCommand.h
r993 r1001 50 50 51 51 #define ConsoleCommandShortcutGeneric(fakevariable, executor) \ 52 boolfakevariable = CommandExecutor::addConsoleCommandShortcut((ExecutorStatic*)executor)52 Executor& fakevariable = CommandExecutor::addConsoleCommandShortcut((ExecutorStatic*)executor) 53 53 54 54 -
code/branches/core2/src/orxonox/core/Functor.h
r967 r1001 325 325 void operator()(const MultiTypeMath& param1 = MT_null, const MultiTypeMath& param2 = MT_null, const MultiTypeMath& param3 = MT_null, const MultiTypeMath& param4 = MT_null, const MultiTypeMath& param5 = MT_null) \ 326 326 { \ 327 std::cout << "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" << std::endl; \ 328 std::cout << param1 << std::endl; \ 329 std::cout << this->getTypenameParam(0) << std::endl; \ 327 330 FUNCTOR_STORE_RETURNVALUE(returnvalue, (*this->functionPointer_)(FUNCTOR_FUNCTION_CALL(numparams))); \ 331 std::cout << "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" << std::endl; \ 328 332 } \ 329 333 \
Note: See TracChangeset
for help on using the changeset viewer.