games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Clients will now switch to turn options when host does so

Browse Source
This commit is contained in:
Ivan Savenko
2023-12-20 23:52:39 +02:00
parent 4986b9031d
commit fe5918ebf5
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/NetPacksLobbyClient.cpp
View File

@@ -15,6 +15,7 @@
#include "lobby/OptionsTab.h" #include "lobby/OptionsTab.h"
#include "lobby/RandomMapTab.h" #include "lobby/RandomMapTab.h"
#include "lobby/TurnOptionsTab.h"
#include "lobby/SelectionTab.h" #include "lobby/SelectionTab.h"
#include "lobby/CBonusSelection.h" #include "lobby/CBonusSelection.h"
@@ -95,6 +96,9 @@ void ApplyOnLobbyScreenNetPackVisitor::visitLobbyGuiAction(LobbyGuiAction & pack
case LobbyGuiAction::OPEN_RANDOM_MAP_OPTIONS: case LobbyGuiAction::OPEN_RANDOM_MAP_OPTIONS:
lobby->toggleTab(lobby->tabRand); lobby->toggleTab(lobby->tabRand);
break; break;
case LobbyGuiAction::OPEN_TURN_OPTIONS:
lobby->toggleTab(lobby->tabTurnOptions);
break;
} }
} }

2
client/lobby/CLobbyScreen.cpp
View File

@@ -120,6 +120,8 @@ void CLobbyScreen::toggleTab(std::shared_ptr<CIntObject> tab)
CSH->sendGuiAction(LobbyGuiAction::OPEN_SCENARIO_LIST); CSH->sendGuiAction(LobbyGuiAction::OPEN_SCENARIO_LIST);
else if(tab == tabRand) else if(tab == tabRand)
CSH->sendGuiAction(LobbyGuiAction::OPEN_RANDOM_MAP_OPTIONS); CSH->sendGuiAction(LobbyGuiAction::OPEN_RANDOM_MAP_OPTIONS);
else if(tab == tabTurnOptions)
CSH->sendGuiAction(LobbyGuiAction::OPEN_TURN_OPTIONS);
CSelectionBase::toggleTab(tab); CSelectionBase::toggleTab(tab);
} }

2
lib/networkPacks/PacksForLobby.h
View File

@@ -86,7 +86,7 @@ struct DLL_LINKAGE LobbyChatMessage : public CLobbyPackToPropagate
struct DLL_LINKAGE LobbyGuiAction : public CLobbyPackToPropagate struct DLL_LINKAGE LobbyGuiAction : public CLobbyPackToPropagate
{ {
enum EAction : ui8 { enum EAction : ui8 {
NONE, NO_TAB, OPEN_OPTIONS, OPEN_SCENARIO_LIST, OPEN_RANDOM_MAP_OPTIONS NONE, NO_TAB, OPEN_OPTIONS, OPEN_SCENARIO_LIST, OPEN_RANDOM_MAP_OPTIONS, OPEN_TURN_OPTIONS
} action = NONE; } action = NONE;