Changeset 9396 in orxonox.OLD for branches/proxy/src/story_entities/menu

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

Location:

branches/proxy/src/story_entities/menu

Files:

• game_menu.cc (modified) (3 diffs)
• game_menu.h (modified) (1 diff)

branches/proxy/src/story_entities/menu/game_menu.cc

@@ -574 +574 @@
       OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
       serverNetworkBox->pack(createButton);
-      createButton->released.connect(this, &GameMenu::createServer);
+      createButton->released.connect(this, &GameMenu::createMasterServer);
     }
   }
@@ -593 +593 @@
 
   State::setOnline(true);
-  NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
+  NetworkManager::getInstance()->createClient( this->ipInputLine->_getText(), 9999 );
 
   Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
@@ -600 +600 @@
 }
 
-void GameMenu::createServer( )
+void GameMenu::createMasterServer( )
 {
   PRINTF(0)("Create server\n" );
 
   State::setOnline(true);
-  NetworkManager::getInstance()->createServer( 9999 );
+  NetworkManager::getInstance()->createMasterServer( 9999 );
 
   this->startLevel( 5 );

branches/proxy/src/story_entities/menu/game_menu.h

@@ -50 +50 @@
     
     void showServerMenu();
-    void createServer();
+    void createMasterServer();