games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

donotstartserver: ask for IP and port even for "host" player

Browse Source 
When "--donotstartserver" option specified client will show dialog to use any IP/port for host player.
This commit is contained in:
Arseniy Shestakov
2016-09-18 23:24:08 +03:00
parent 1d45d214e5
commit 58d11d6074
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/CPreGame.cpp
View File

@@ -699,7 +699,10 @@ CSelectionScreen::CSelectionScreen(CMenuScreen::EState Type, CMenuScreen::EMulti
if(isHost()) if(isHost())
{ {
assert(playerNames.size() == 1 && vstd::contains(playerNames, 1)); //TODO hot-seat/network combo assert(playerNames.size() == 1 && vstd::contains(playerNames, 1)); //TODO hot-seat/network combo
serv = sh->connectToServer(); if(CServerHandler::DO_NOT_START_SERVER)
serv = CServerHandler::justConnectToServer(Address, Port);
else
serv = sh->connectToServer();
*serv << (ui8) 4; *serv << (ui8) 4;
myNameID = 1; myNameID = 1;
} }
@@ -3129,14 +3132,17 @@ void CMultiMode::hostTCP()
Settings name = settings.write["general"]["playerName"]; Settings name = settings.write["general"]["playerName"];
name->String() = txt->text; name->String() = txt->text;
GH.popIntTotally(this); GH.popIntTotally(this);
GH.pushInt(new CSelectionScreen(CMenuScreen::newGame, CMenuScreen::MULTI_NETWORK_HOST)); if(CServerHandler::DO_NOT_START_SERVER)
GH.pushInt(new CSimpleJoinScreen(CMenuScreen::MULTI_NETWORK_HOST));
else
GH.pushInt(new CSelectionScreen(CMenuScreen::newGame, CMenuScreen::MULTI_NETWORK_HOST));
} }
void CMultiMode::joinTCP() void CMultiMode::joinTCP()
{ {
Settings name = settings.write["general"]["playerName"]; Settings name = settings.write["general"]["playerName"];
name->String() = txt->text; name->String() = txt->text;
GH.pushInt(new CSimpleJoinScreen); GH.pushInt(new CSimpleJoinScreen(CMenuScreen::MULTI_NETWORK_GUEST));
} }
CHotSeatPlayers::CHotSeatPlayers(const std::string &firstPlayer) CHotSeatPlayers::CHotSeatPlayers(const std::string &firstPlayer)
@@ -4273,7 +4279,7 @@ void CPrologEpilogVideo::clickLeft( tribool down, bool previousState )
exitCb(); exitCb();
} }
CSimpleJoinScreen::CSimpleJoinScreen() CSimpleJoinScreen::CSimpleJoinScreen(CMenuScreen::EMultiMode mode)
{ {
OBJ_CONSTRUCTION_CAPTURING_ALL; OBJ_CONSTRUCTION_CAPTURING_ALL;
bg = new CPicture("MUDIALOG.bmp"); // address background bg = new CPicture("MUDIALOG.bmp"); // address background
@@ -4289,7 +4295,7 @@ CSimpleJoinScreen::CSimpleJoinScreen()
port->cb += std::bind(&CSimpleJoinScreen::onChange, this, _1); port->cb += std::bind(&CSimpleJoinScreen::onChange, this, _1);
port->filters += std::bind(&CTextInput::numberFilter, _1, _2, 0, 65535); port->filters += std::bind(&CTextInput::numberFilter, _1, _2, 0, 65535);
ok = new CButton(Point( 26, 142), "MUBCHCK.DEF", CGI->generaltexth->zelp[560], std::bind(&CSimpleJoinScreen::enterSelectionScreen, this), SDLK_RETURN); ok = new CButton(Point( 26, 142), "MUBCHCK.DEF", CGI->generaltexth->zelp[560], std::bind(&CSimpleJoinScreen::enterSelectionScreen, this, mode), SDLK_RETURN);
cancel = new CButton(Point(142, 142), "MUBCANC.DEF", CGI->generaltexth->zelp[561], std::bind(&CGuiHandler::popIntTotally, std::ref(GH), this), SDLK_ESCAPE); cancel = new CButton(Point(142, 142), "MUBCANC.DEF", CGI->generaltexth->zelp[561], std::bind(&CGuiHandler::popIntTotally, std::ref(GH), this), SDLK_ESCAPE);
bar = new CGStatusBar(new CPicture(Rect(7, 186, 218, 18), 0)); bar = new CGStatusBar(new CPicture(Rect(7, 186, 218, 18), 0));
@@ -4298,15 +4304,15 @@ CSimpleJoinScreen::CSimpleJoinScreen()
address->giveFocus(); address->giveFocus();
} }
void CSimpleJoinScreen::enterSelectionScreen() void CSimpleJoinScreen::enterSelectionScreen(CMenuScreen::EMultiMode mode)
{ {
std::string textAddress = address->text; std::string textAddress = address->text;
std::string textPort = port->text; std::string textPort = port->text;
GH.popIntTotally(this); GH.popIntTotally(this);
GH.pushInt(new CSelectionScreen(CMenuScreen::newGame, CMenuScreen::MULTI_NETWORK_GUEST, nullptr, textAddress, textPort));
}
GH.pushInt(new CSelectionScreen(CMenuScreen::newGame, mode, nullptr, textAddress, textPort));
}
void CSimpleJoinScreen::onChange(const std::string & newText) void CSimpleJoinScreen::onChange(const std::string & newText)
{ {
ok->block(address->text.empty() || port->text.empty()); ok->block(address->text.empty() || port->text.empty());

4
client/CPreGame.h
View File

@@ -642,10 +642,10 @@ class CSimpleJoinScreen : public CIntObject
CTextInput * address; CTextInput * address;
CTextInput * port; CTextInput * port;
void enterSelectionScreen(); void enterSelectionScreen(CMenuScreen::EMultiMode mode);
void onChange(const std::string & newText); void onChange(const std::string & newText);
public: public:
CSimpleJoinScreen(); CSimpleJoinScreen(CMenuScreen::EMultiMode mode);
}; };
extern ISelectionScreenInfo *SEL; extern ISelectionScreenInfo *SEL;