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

Timestamp:

Jul 5, 2006, 4:39:02 PM (18 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/story_entities/menu/game_menu.cc (modified) (13 diffs)

trunk/src/story_entities/menu/game_menu.cc

@@ -40 +40 @@
 
 #include "network_manager.h"
+
+#include "preferences.h"
 
 //! This creates a Factory to fabricate a GameMenu
@@ -126 +128 @@
   this->levelsBox = NULL;
   this->networkBox = NULL;
-  
+
   this->clientNetworkBox = NULL;
   this->serverNetworkBox = NULL;
@@ -239 +241 @@
     {
       OrxGui::GLGuiBox * box = new OrxGui::GLGuiBox();
-      
+
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
       box->pack(clientButton);
@@ -247 +249 @@
       box->pack(serverButton);
       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
-      
+
       networkBox->pack( box );
     }
@@ -340 +342 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
-  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 1, 49);
 
   /* now call the underlying*/
@@ -518 +519 @@
     //this->serverNetworkBox = NULL;
   }
-  
+
   if ( !this->clientNetworkBox )
   {
@@ -526 +527 @@
       text->setText( "Host:" );
       this->clientNetworkBox->pack( text );
-      
+
       this->ipInputLine = new OrxGui::GLGuiInputLine( );
-      this->ipInputLine->setText( "tardis-d08" );
+      this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) );
       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);
@@ -538 +539 @@
     }
   }
-  
+
   this->networkBox->pack( this->clientNetworkBox );
-  
+
   this->clientNetworkBox->showAll();
-  
+
   //this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -558 +559 @@
     //this->clientNetworkBox = NULL;
   }
-  
+
   if ( !this->serverNetworkBox )
   {
@@ -566 +567 @@
       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);
@@ -576 +577 @@
     }
   }
-  
+
   this->networkBox->pack( this->serverNetworkBox );
-  
+
   this->serverNetworkBox->showAll();
-  
+
   //this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
@@ -590 +591 @@
 {
   PRINTF(0)("Connecting to %s\n", this->ipInputLine->_getText().c_str() );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
-  
+
+  Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
+
   this->startLevel( 5 );
 }
@@ -600 +603 @@
 {
   PRINTF(0)("Create server\n" );
-  
+
   State::setOnline(true);
   NetworkManager::getInstance()->createServer( 9999 );
-  
+
   this->startLevel( 5 );
 }