Changeset 8858 for code/trunk/src/orxonox/Main.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/Main.cc
r8729 r8858 61 61 int main(const std::string& strCmdLine) 62 62 { 63 orxout(internal_status) << "entering orxonox::main()" << endl; 64 orxout(internal_info) << "command line: " << strCmdLine << endl; 65 66 orxout(internal_info) << "creating Game object:" << endl; 63 67 Game* game = new Game(strCmdLine); 68 orxout(user_status) << "Finished initialization" << endl; 64 69 65 70 if (CommandLineParser::getValue("generateDoc").getString().empty()) 66 71 { 72 orxout(internal_info) << "preparing game states" << endl; 73 67 74 /* TODO make this clear */ 68 75 game->setStateHierarchy( … … 98 105 } 99 106 107 orxout(internal_info) << "starting game" << endl; 100 108 game->run(); 101 109 }
Note: See TracChangeset
for help on using the changeset viewer.