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

Guest can also use & renaming

Browse Source
This commit is contained in:
Laserlicht
2024-05-01 15:58:22 +02:00
parent 5b8b75da22
commit 812e96ebb1
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/lobby/CSelectionBase.cpp
View File

@ -403,25 +403,22 @@ PvPBox::PvPBox(const Rect & rect)
backgroundTexture->playerColored(PlayerColor(1)); backgroundTexture->playerColored(PlayerColor(1));
backgroundBorder = std::make_shared<TransparentFilledRectangle>(Rect(0, 0, rect.w, rect.h), ColorRGBA(0, 0, 0, 64), ColorRGBA(96, 96, 96, 255), 1); backgroundBorder = std::make_shared<TransparentFilledRectangle>(Rect(0, 0, rect.w, rect.h), ColorRGBA(0, 0, 0, 64), ColorRGBA(96, 96, 96, 255), 1);
factionSelector = std::make_shared<FactionSelector>(Point(5, 3)); townSelector = std::make_shared<TownSelector>(Point(5, 3));
auto getBannedTowns = [this](){ auto getBannedTowns = [this](){
std::vector<FactionID> bannedTowns; std::vector<FactionID> bannedTowns;
for(auto & town : factionSelector->townsEnabled) for(auto & town : townSelector->townsEnabled)
if(!town.second) if(!town.second)
bannedTowns.push_back(town.first); bannedTowns.push_back(town.first);
return bannedTowns; return bannedTowns;
}; };
auto buttonColor = CSH->isGuest() ? Colors::WHITE : Colors::ORANGE;
buttonFlipCoin = std::make_shared<CButton>(Point(190, 6), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.coin.help")), [](){ buttonFlipCoin = std::make_shared<CButton>(Point(190, 6), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.coin.help")), [](){
LobbyPvPAction lpa; LobbyPvPAction lpa;
lpa.action = LobbyPvPAction::COIN; lpa.action = LobbyPvPAction::COIN;
CSH->sendLobbyPack(lpa); CSH->sendLobbyPack(lpa);
}, EShortcut::NONE); }, EShortcut::NONE);
buttonFlipCoin->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.coin.hover"), EFonts::FONT_SMALL, buttonColor); buttonFlipCoin->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.coin.hover"), EFonts::FONT_SMALL, Colors::WHITE);
buttonFlipCoin->block(!CSH->isGuest());
buttonRandomTown = std::make_shared<CButton>(Point(190, 31), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.randomTown.help")), [getBannedTowns](){ buttonRandomTown = std::make_shared<CButton>(Point(190, 31), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.randomTown.help")), [getBannedTowns](){
LobbyPvPAction lpa; LobbyPvPAction lpa;
@ -429,8 +426,7 @@ PvPBox::PvPBox(const Rect & rect)
lpa.bannedTowns = getBannedTowns(); lpa.bannedTowns = getBannedTowns();
CSH->sendLobbyPack(lpa); CSH->sendLobbyPack(lpa);
}, EShortcut::NONE); }, EShortcut::NONE);
buttonRandomTown->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.randomTown.hover"), EFonts::FONT_SMALL, buttonColor); buttonRandomTown->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.randomTown.hover"), EFonts::FONT_SMALL, Colors::WHITE);
buttonRandomTown->block(!CSH->isGuest());
buttonRandomTownVs = std::make_shared<CButton>(Point(190, 56), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.randomTownVs.help")), [getBannedTowns](){ buttonRandomTownVs = std::make_shared<CButton>(Point(190, 56), AnimationPath::builtin("GSPBUT2.DEF"), CButton::tooltip("", CGI->generaltexth->translate("vcmi.lobby.pvp.randomTownVs.help")), [getBannedTowns](){
LobbyPvPAction lpa; LobbyPvPAction lpa;
@ -438,11 +434,10 @@ PvPBox::PvPBox(const Rect & rect)
lpa.bannedTowns = getBannedTowns(); lpa.bannedTowns = getBannedTowns();
CSH->sendLobbyPack(lpa); CSH->sendLobbyPack(lpa);
}, EShortcut::NONE); }, EShortcut::NONE);
buttonRandomTownVs->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.randomTownVs.hover"), EFonts::FONT_SMALL, buttonColor); buttonRandomTownVs->setTextOverlay(CGI->generaltexth->translate("vcmi.lobby.pvp.randomTownVs.hover"), EFonts::FONT_SMALL, Colors::WHITE);
buttonRandomTownVs->block(!CSH->isGuest());
} }
FactionSelector::FactionSelector(const Point & loc) TownSelector::TownSelector(const Point & loc)
{ {
OBJ_CONSTRUCTION; OBJ_CONSTRUCTION;
pos += loc; pos += loc;
@ -460,7 +455,7 @@ FactionSelector::FactionSelector(const Point & loc)
if(count > 9) if(count > 9)
{ {
slider = std::make_shared<CSlider>(Point(144, 0), 96, std::bind(&FactionSelector::sliderMove, this, _1), 3, divisionRoundUp(count, 3), 0, Orientation::VERTICAL, CSlider::BLUE); slider = std::make_shared<CSlider>(Point(144, 0), 96, std::bind(&TownSelector::sliderMove, this, _1), 3, divisionRoundUp(count, 3), 0, Orientation::VERTICAL, CSlider::BLUE);
slider->setPanningStep(24); slider->setPanningStep(24);
slider->setScrollBounds(Rect(-144, 0, slider->pos.x - pos.x + slider->pos.w, slider->pos.h)); slider->setScrollBounds(Rect(-144, 0, slider->pos.x - pos.x + slider->pos.w, slider->pos.h));
} }
@ -468,7 +463,7 @@ FactionSelector::FactionSelector(const Point & loc)
updateListItems(); updateListItems();
} }
void FactionSelector::updateListItems() void TownSelector::updateListItems()
{ {
OBJ_CONSTRUCTION; OBJ_CONSTRUCTION;
int line = slider ? slider->getValue() : 0; int line = slider ? slider->getValue() : 0;
@ -488,8 +483,6 @@ void FactionSelector::updateListItems()
auto getImageIndex = [](FactionID factionID, bool enabled){ return (*CGI->townh)[factionID]->town->clientInfo.icons[true][!enabled] + 2; }; auto getImageIndex = [](FactionID factionID, bool enabled){ return (*CGI->townh)[factionID]->town->clientInfo.icons[true][!enabled] + 2; };
towns[factionID] = std::make_shared<CAnimImage>(AnimationPath::builtin("ITPA"), getImageIndex(factionID, townsEnabled[factionID]), 0, x_offset + 48 * x, 32 * (y - line)); towns[factionID] = std::make_shared<CAnimImage>(AnimationPath::builtin("ITPA"), getImageIndex(factionID, townsEnabled[factionID]), 0, x_offset + 48 * x, 32 * (y - line));
townsArea[factionID] = std::make_shared<LRClickableArea>(Rect(x_offset + 48 * x, 32 * (y - line), 48, 32), [this, getImageIndex, factionID](){ townsArea[factionID] = std::make_shared<LRClickableArea>(Rect(x_offset + 48 * x, 32 * (y - line), 48, 32), [this, getImageIndex, factionID](){
if(CSH->isGuest())
return;
townsEnabled[factionID] = !townsEnabled[factionID]; townsEnabled[factionID] = !townsEnabled[factionID];
towns[factionID]->setFrame(getImageIndex(factionID, townsEnabled[factionID])); towns[factionID]->setFrame(getImageIndex(factionID, townsEnabled[factionID]));
redraw(); redraw();
@ -506,7 +499,7 @@ void FactionSelector::updateListItems()
}); });
} }
void FactionSelector::sliderMove(int slidPos) void TownSelector::sliderMove(int slidPos)
{ {
if(!slider) if(!slider)
return; // ignore spurious call when slider is being created return; // ignore spurious call when slider is being created

8
client/lobby/CSelectionBase.h
View File

@ -32,7 +32,7 @@ class SelectionTab;
class InfoCard; class InfoCard;
class CChatBox; class CChatBox;
class PvPBox; class PvPBox;
class FactionSelector; class TownSelector;
class CLabel; class CLabel;
class CSlider; class CSlider;
class CFlagBox; class CFlagBox;
@ -148,7 +148,7 @@ class PvPBox : public CIntObject
std::shared_ptr<FilledTexturePlayerColored> backgroundTexture; std::shared_ptr<FilledTexturePlayerColored> backgroundTexture;
std::shared_ptr<TransparentFilledRectangle> backgroundBorder; std::shared_ptr<TransparentFilledRectangle> backgroundBorder;
std::shared_ptr<FactionSelector> factionSelector; std::shared_ptr<TownSelector> townSelector;
std::shared_ptr<CButton> buttonFlipCoin; std::shared_ptr<CButton> buttonFlipCoin;
std::shared_ptr<CButton> buttonRandomTown; std::shared_ptr<CButton> buttonRandomTown;
@ -157,7 +157,7 @@ public:
PvPBox(const Rect & rect); PvPBox(const Rect & rect);
}; };
class FactionSelector : public CIntObject class TownSelector : public CIntObject
{ {
std::map<FactionID, std::shared_ptr<CAnimImage>> towns; std::map<FactionID, std::shared_ptr<CAnimImage>> towns;
std::map<FactionID, std::shared_ptr<LRClickableArea>> townsArea; std::map<FactionID, std::shared_ptr<LRClickableArea>> townsArea;
@ -169,7 +169,7 @@ class FactionSelector : public CIntObject
public: public:
std::map<FactionID, bool> townsEnabled; std::map<FactionID, bool> townsEnabled;
FactionSelector(const Point & loc); TownSelector(const Point & loc);
}; };
class CFlagBox : public CIntObject class CFlagBox : public CIntObject

2
lib/registerTypes/RegisterTypesLobbyPacks.h
View File

@ -34,6 +34,7 @@ void registerTypesLobbyPacks(Serializer &s)
s.template registerType<CLobbyPackToPropagate, LobbyClientConnected>(); s.template registerType<CLobbyPackToPropagate, LobbyClientConnected>();
s.template registerType<CLobbyPackToPropagate, LobbyClientDisconnected>(); s.template registerType<CLobbyPackToPropagate, LobbyClientDisconnected>();
s.template registerType<CLobbyPackToPropagate, LobbyChatMessage>(); s.template registerType<CLobbyPackToPropagate, LobbyChatMessage>();
s.template registerType<CLobbyPackToServer, LobbyPvPAction>();
// Only host client send // Only host client send
s.template registerType<CLobbyPackToPropagate, LobbyGuiAction>(); s.template registerType<CLobbyPackToPropagate, LobbyGuiAction>();
s.template registerType<CLobbyPackToPropagate, LobbyLoadProgress>(); s.template registerType<CLobbyPackToPropagate, LobbyLoadProgress>();
@ -59,7 +60,6 @@ void registerTypesLobbyPacks(Serializer &s)
s.template registerType<CLobbyPackToServer, LobbySetDifficulty>(); s.template registerType<CLobbyPackToServer, LobbySetDifficulty>();
s.template registerType<CLobbyPackToServer, LobbyForceSetPlayer>(); s.template registerType<CLobbyPackToServer, LobbyForceSetPlayer>();
s.template registerType<CLobbyPackToServer, LobbySetExtraOptions>(); s.template registerType<CLobbyPackToServer, LobbySetExtraOptions>();
s.template registerType<CLobbyPackToServer, LobbyPvPAction>();
} }
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

1
server/LobbyNetPackVisitors.h
View File

@ -38,6 +38,7 @@ public:
void visitLobbyChangePlayerOption(LobbyChangePlayerOption & pack) override; void visitLobbyChangePlayerOption(LobbyChangePlayerOption & pack) override;
void visitLobbyChatMessage(LobbyChatMessage & pack) override; void visitLobbyChatMessage(LobbyChatMessage & pack) override;
void visitLobbyGuiAction(LobbyGuiAction & pack) override; void visitLobbyGuiAction(LobbyGuiAction & pack) override;
void visitLobbyPvPAction(LobbyPvPAction & pack) override;
}; };
class ApplyOnServerAfterAnnounceNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor) class ApplyOnServerAfterAnnounceNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)

6
server/NetPacksLobbyServer.cpp
View File

@ -370,6 +370,12 @@ void ApplyOnServerNetPackVisitor::visitLobbyForceSetPlayer(LobbyForceSetPlayer &
result = true; result = true;
} }
void ClientPermissionsCheckerNetPackVisitor::visitLobbyPvPAction(LobbyPvPAction & pack)
{
result = true;
}
void ApplyOnServerNetPackVisitor::visitLobbyPvPAction(LobbyPvPAction & pack) void ApplyOnServerNetPackVisitor::visitLobbyPvPAction(LobbyPvPAction & pack)
{ {
std::vector<FactionID> allowedTowns; std::vector<FactionID> allowedTowns;