Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/story_entities/menu
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/story_entities/menu/game_menu.cc

    r9235 r9406  
    152152    {
    153153      OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play");
    154       startButton->connect(SIGNAL(startButton, released), this, SLOT(GameMenu, showCampaigns));
     154      startButton->released.connect(this, &GameMenu::showCampaigns);
    155155      this->mainMenuBox->pack(startButton);
    156156      startButton->select();
    157157
    158158      OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer");
    159       networkButton->connect(SIGNAL(networkButton, released), this, SLOT(GameMenu, showMultiPlayer));
     159      networkButton->released.connect(this, &GameMenu::showMultiPlayer);
    160160      this->mainMenuBox->pack(networkButton);
    161161
    162162      OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options");
    163       optionsButton->connect(SIGNAL(optionsButton, released), this, SLOT(GameMenu, showOptionsMenu));
     163      optionsButton->released.connect(this, &GameMenu::showOptionsMenu);
    164164      this->mainMenuBox->pack(optionsButton);
    165165
     
    167167      OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit");
    168168      this->mainMenuBox->pack(quitButton);
    169       quitButton->connect(SIGNAL(quitButton, released), this, SLOT(GameMenu, quitMenu));
     169      quitButton->released.connect(this, &GameMenu::quitMenu);
    170170    }
    171171  }
     
    202202          printf("%s\n", se->getMenuScreenshoot().c_str());
    203203          OrxGui::GLGuiImageButton* button = new OrxGui::GLGuiImageButton(se->getName(), se->getStoryID(), se->getMenuScreenshoot(), image);
    204           button->connect(SIGNAL(button, startLevel), this, SLOT(GameMenu, startLevel));
     204          button->startLevel.connect(this, &GameMenu::startLevel);
    205205          labelBox->pack(button);
    206206
     
    244244      OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
    245245      box->pack(clientButton);
    246       clientButton->connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));
     246      clientButton->released.connect(this, &GameMenu::showClientMenu);
    247247
    248248      OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server");
    249249      box->pack(serverButton);
    250       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
     250      serverButton->released.connect(this, &GameMenu::showServerMenu);
    251251
    252252      networkBox->pack( box );
     
    531531      this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) );
    532532      this->clientNetworkBox->pack( this->ipInputLine );
    533       this->ipInputLine->connect(SIGNAL(ipInputLine, enterPushed), this, SLOT(GameMenu, connectToServer));
     533      //this->ipInputLine->enterPushed.connect(this, &GameMenu::connectToServer); /// redo this.
    534534      this->ipInputLine->select();
    535535
    536536      OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect");
    537537      clientNetworkBox->pack(connectButton);
    538       connectButton->connect(SIGNAL(connectButton, released), this, SLOT(GameMenu, connectToServer));
     538      connectButton->released.connect(this, &GameMenu::connectToServer);
    539539    }
    540540  }
     
    574574      OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server");
    575575      serverNetworkBox->pack(createButton);
    576       createButton->connect(SIGNAL(createButton, released), this, SLOT(GameMenu, createServer));
     576      createButton->released.connect(this, &GameMenu::createMasterServer);
    577577    }
    578578  }
     
    593593
    594594  State::setOnline(true);
    595   NetworkManager::getInstance()->establishConnection( this->ipInputLine->_getText(), 9999 );
     595  NetworkManager::getInstance()->createClient( this->ipInputLine->_getText(), 9999 );
    596596
    597597  Preferences::getInstance()->setString( "multiplayer", "lastVisitedServer", this->ipInputLine->_getText() );
     
    600600}
    601601
    602 void GameMenu::createServer( )
     602void GameMenu::createMasterServer( )
    603603{
    604604  PRINTF(0)("Create server\n" );
    605605
    606606  State::setOnline(true);
    607   NetworkManager::getInstance()->createServer( 9999 );
     607  NetworkManager::getInstance()->createMasterServer( 9999 );
    608608
    609609  this->startLevel( 5 );
  • trunk/src/story_entities/menu/game_menu.h

    r9059 r9406  
    5050   
    5151    void showServerMenu();
    52     void createServer();
     52    void createMasterServer();
    5353
    5454
  • trunk/src/story_entities/menu/glgui_imagebutton.cc

    r8740 r9406  
    4040    GLGuiPushButton::releasing(pos, focused);
    4141    if (focused)
    42       this->emit(startLevel(this->levelID));
     42      this->startLevel.emit(this->levelID);
    4343  }
    4444
     
    7777      {
    7878//        emit(released());
    79         emit(startLevel(this->levelID));
     79        startLevel.emit(this->levelID);
    8080      }
    8181      return true;
  • trunk/src/story_entities/menu/glgui_imagebutton.h

    r8740 r9406  
    2525    void release();
    2626
    27     DeclareSignal1(startLevel, int);
     27    sigslot::signal1<int> startLevel;
    2828
    2929  protected:
Note: See TracChangeset for help on using the changeset viewer.