Changeset 9369 in orxonox.OLD for branches/proxy/src/story_entities/menu
- Timestamp:
- Jul 20, 2006, 9:16:39 PM (18 years ago)
- Location:
- branches/proxy/src/story_entities/menu
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/story_entities/menu/game_menu.cc
r9235 r9369 152 152 { 153 153 OrxGui::GLGuiButton* startButton = new OrxGui::GLGuiPushButton("Play"); 154 startButton-> connect(SIGNAL(startButton, released), this, SLOT(GameMenu, showCampaigns));154 startButton->released.connect(this, &GameMenu::showCampaigns); 155 155 this->mainMenuBox->pack(startButton); 156 156 startButton->select(); 157 157 158 158 OrxGui::GLGuiButton* networkButton = new OrxGui::GLGuiPushButton("MultiPlayer"); 159 networkButton-> connect(SIGNAL(networkButton, released), this, SLOT(GameMenu, showMultiPlayer));159 networkButton->released.connect(this, &GameMenu::showMultiPlayer); 160 160 this->mainMenuBox->pack(networkButton); 161 161 162 162 OrxGui::GLGuiButton* optionsButton = new OrxGui::GLGuiPushButton("Options"); 163 optionsButton-> connect(SIGNAL(optionsButton, released), this, SLOT(GameMenu, showOptionsMenu));163 optionsButton->released.connect(this, &GameMenu::showOptionsMenu); 164 164 this->mainMenuBox->pack(optionsButton); 165 165 … … 167 167 OrxGui::GLGuiButton* quitButton = new OrxGui::GLGuiPushButton("Quit"); 168 168 this->mainMenuBox->pack(quitButton); 169 quitButton-> connect(SIGNAL(quitButton, released), this, SLOT(GameMenu, quitMenu));169 quitButton->released.connect(this, &GameMenu::quitMenu); 170 170 } 171 171 } … … 202 202 printf("%s\n", se->getMenuScreenshoot().c_str()); 203 203 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); 205 205 labelBox->pack(button); 206 206 … … 244 244 OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client"); 245 245 box->pack(clientButton); 246 clientButton-> connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));246 clientButton->released.connect(this, &GameMenu::showClientMenu); 247 247 248 248 OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server"); 249 249 box->pack(serverButton); 250 serverButton-> connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));250 serverButton->released.connect(this, &GameMenu::showServerMenu); 251 251 252 252 networkBox->pack( box ); … … 531 531 this->ipInputLine->setText( Preferences::getInstance()->getString( "multiplayer", "lastVisitedServer", "localhost" ) ); 532 532 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. 534 534 this->ipInputLine->select(); 535 535 536 536 OrxGui::GLGuiButton* connectButton = new OrxGui::GLGuiPushButton("Connect"); 537 537 clientNetworkBox->pack(connectButton); 538 connectButton-> connect(SIGNAL(connectButton, released), this, SLOT(GameMenu, connectToServer));538 connectButton->released.connect(this, &GameMenu::connectToServer); 539 539 } 540 540 } … … 574 574 OrxGui::GLGuiButton* createButton = new OrxGui::GLGuiPushButton("Create Server"); 575 575 serverNetworkBox->pack(createButton); 576 createButton-> connect(SIGNAL(createButton, released), this, SLOT(GameMenu, createServer));576 createButton->released.connect(this, &GameMenu::createServer); 577 577 } 578 578 } -
branches/proxy/src/story_entities/menu/glgui_imagebutton.cc
r8740 r9369 40 40 GLGuiPushButton::releasing(pos, focused); 41 41 if (focused) 42 this-> emit(startLevel(this->levelID));42 this->startLevel.emit(this->levelID); 43 43 } 44 44 … … 77 77 { 78 78 // emit(released()); 79 emit(startLevel(this->levelID));79 startLevel.emit(this->levelID); 80 80 } 81 81 return true; -
branches/proxy/src/story_entities/menu/glgui_imagebutton.h
r8740 r9369 25 25 void release(); 26 26 27 DeclareSignal1(startLevel, int);27 sigslot::signal1<int> startLevel; 28 28 29 29 protected:
Note: See TracChangeset
for help on using the changeset viewer.