Changeset 9059 in orxonox.OLD for trunk/src/story_entities/menu

Timestamp:

Jul 3, 2006, 6:30:42 PM (18 years ago)

Author:

patrick

Message:

merged the network branche with the trunk

Location:

trunk/src/story_entities/menu

Files:

• game_menu.cc (modified) (4 diffs)
• game_menu.h (modified) (3 diffs)

trunk/src/story_entities/menu/game_menu.cc

@@ -36 +36 @@
 #include "glgui.h"
 #include "menu/glgui_imagebutton.h"
+
+#include "glgui_text.h"
+
+#include "network_manager.h"
 
 //! This creates a Factory to fabricate a GameMenu
@@ -122 +126 @@
   this->levelsBox = NULL;
   this->networkBox = NULL;
+  
+  this->clientNetworkBox = NULL;
+  this->serverNetworkBox = NULL;
 
   this->optionsBox = NULL;
@@ -233 +240 @@
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
       networkBox->pack(clientButton);
+      clientButton->connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));
 
       OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server");
       networkBox->pack(serverButton);
+      serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
 
 
@@ -495 +504 @@
 }
 
-
-
+/**
+ * show controls to join network game
+ */
+void GameMenu::showClientMenu( )
+{
+  if ( this->serverNetworkBox )
+  {
+    delete this->serverNetworkBox;
+    this->serverNetworkBox = NULL;
+  }
+  
+  if ( !this->clientNetworkBox )
+  {
+    this->clientNetworkBox = new OrxGui::GLGuiBox();
+    {
+      OrxGui::GLGuiText * text = new OrxGui::GLGuiText();
+      text->setText( "Host:" );
+      this->clientNetworkBox->pack( text );
+      
+      this->ipInputLine = new OrxGui::GLGuiInputLine( );
+      this->ipInputLine->setText( "tardis-d08" );
+      this->clientNetworkBox->pack( this->ipInputLine );
+      this->ipInputLine->connect(SIGNAL(ipInputLine, enterPushed), this, SLOT(GameMenu, connectToServer));
+      this->ipInputLine->select();
+      
+      OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect");
+      clientNetworkBox->pack(connectButton);
+      connectButton->connect(SIGNAL(connectButton, released), this, SLOT(GameMenu, connectToServer));
+    }
+  }
+  
+  this->clientNetworkBox->showAll();
+  
+  this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+}
+
+/**
+ * show controls to create new network game
+ */
+void GameMenu::showServerMenu( )
+{
+  if ( this->clientNetworkBox )
+  {
+    delete this->clientNetworkBox;
+    this->clientNetworkBox = NULL;
+  }
+  
+  if ( !this->serverNetworkBox )
+  {
+    this->serverNetworkBox = new OrxGui::GLGuiBox();
+    {
+      OrxGui::GLGuiText * text = new OrxGui::GLGuiText();
+      text->setText( "Map:" );
+      this->serverNetworkBox->pack( text );
+      
+      OrxGui::GLGuiText * text2 = new OrxGui::GLGuiText();
+      text2->setText( "Multiplayer TeamDeathMatch Arena" );
+      this->serverNetworkBox->pack( text2 );
+      
+      OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
+      serverNetworkBox->pack(createButton);
+      createButton->connect(SIGNAL(createButton, released), this, SLOT(GameMenu, createServer));
+    }
+  }
+  
+  this->serverNetworkBox->showAll();
+  
+  this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+}
+
+/**
+ * connect to host
+ */
+void GameMenu::connectToServer( )
+{
+  PRINTF(0)("Connecting to %s\n", this->ipInputLine->_getText().c_str() );
+  
+  State::setOnline(true);
+  NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
+  
+  this->startLevel( 5 );
+}
+
+void GameMenu::createServer( )
+{
+  PRINTF(0)("Create server\n" );
+  
+  State::setOnline(true);
+  NetworkManager::getInstance()->createServer( 9999 );
+  
+  this->startLevel( 5 );
+}
+
+
+

trunk/src/story_entities/menu/game_menu.h

@@ -45 +45 @@
     void showMultiPlayer();
     void showOptionsMenu();
+    
+    void showClientMenu();
+    void connectToServer();
+    
+    void showServerMenu();
+    void createServer();
 
 
@@ -63 +69 @@
     void setSelectorSound(const std::string& selectorSound);
 
+    
+
 
   private:
@@ -68 +76 @@
     OrxGui::GLGuiBox*                 levelsBox;
     OrxGui::GLGuiBox*                 networkBox;
+    
+    OrxGui::GLGuiBox*                 clientNetworkBox;
+    OrxGui::GLGuiInputLine*           ipInputLine;
+    
+    OrxGui::GLGuiBox*                 serverNetworkBox;
 
     OrxGui::GLGuiBox*                 optionsBox;