Changeset 8858 for code/trunk/src/Orxonox.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/Orxonox.cc
r8351 r8858 43 43 #endif 44 44 45 #include "util/ Debug.h"45 #include "util/Output.h" 46 46 #include "util/Exception.h" 47 47 #include "orxonox/Main.h" … … 59 59 #endif 60 60 { 61 using namespace orxonox; 62 63 orxout(user_status) << "Welcome to Orxonox (v" << ORXONOX_VERSION_MAJOR << '.' << ORXONOX_VERSION_MINOR << '.' << ORXONOX_VERSION_PATCH << ' ' << ORXONOX_VERSION_NAME << ')' << endl; 64 orxout(internal_status) << "Congratulations, you survived the static initialization. Entering main()" << endl; 65 if (argc > 0) 66 orxout(internal_info) << "argv[0]: " << argv[0] << endl; 67 61 68 try 62 69 { … … 70 77 const int firstArgument = 1; 71 78 #endif 72 79 73 80 std::string strCmdLine; 74 81 for (int i = firstArgument; i < argc; ++i) … … 76 83 #endif 77 84 78 return orxonox::main(strCmdLine); 85 int value = main(strCmdLine); 86 orxout(internal_status) << "Terminating main() normally with value " << value << endl; 87 return value; 79 88 } 80 89 catch (...) 81 90 { 82 COUT(0) << "Orxonox failed to initialise: " << orxonox::Exception::handleMessage() << std::endl;83 COUT(0) << "Terminating program." << std::endl;91 orxout(user_error) << "Exception caught in main(): " << orxonox::Exception::handleMessage() << endl; 92 orxout(user_error) << "Terminating program." << endl; 84 93 return 1; 85 94 }
Note: See TracChangeset
for help on using the changeset viewer.