Changeset 8858 for code/trunk/src/orxonox/gamestates/GSMasterServer.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/gamestates/GSMasterServer.cc
r7801 r8858 30 30 #include "GSMasterServer.h" 31 31 32 #include "util/ Debug.h"32 #include "util/Output.h" 33 33 #include "core/Game.h" 34 34 #include "core/GameMode.h" … … 50 50 void GSMasterServer::activate() 51 51 { 52 orxout(user_status) << "Starting masterserver" << endl; 53 52 54 /* TODO make this work for masterserver as well */ 53 55 //GameMode::setIsServer(true); 54 56 55 57 this->mserver = new MasterServer(); 56 COUT(0) << "Loading masterserver mode" << std::endl;57 58 58 this->mserver->run(); 59 59 }
Note: See TracChangeset
for help on using the changeset viewer.