games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Merge branch 'develop' into battleonly

Browse Source
This commit is contained in:
Laserlicht
2025-10-28 14:42:27 +01:00
committed by GitHub
parent b218542d51 dc9fd90f3e
commit a6ea9be489
32 changed files with 292 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/networkPacks/NetPackVisitor.h
View File

@@ -58,6 +58,7 @@ public:
virtual void visitSetCommanderProperty(SetCommanderProperty & pack) {}
virtual void visitAddQuest(AddQuest & pack) {}
virtual void visitChangeFormation(ChangeFormation & pack) {}
virtual void visitChangeTownName(ChangeTownName & pack) {}
virtual void visitRemoveObject(RemoveObject & pack) {}
virtual void visitTryMoveHero(TryMoveHero & pack) {}
virtual void visitNewStructures(NewStructures & pack) {}
@@ -144,6 +145,7 @@ public:
virtual void visitBuyArtifact(BuyArtifact & pack) {}
virtual void visitTradeOnMarketplace(TradeOnMarketplace & pack) {}
virtual void visitSetFormation(SetFormation & pack) {}
virtual void visitSetTownName(SetTownName & pack) {}
virtual void visitHireHero(HireHero & pack) {}
virtual void visitBuildBoat(BuildBoat & pack) {}
virtual void visitQueryReply(QueryReply & pack) {}

10
lib/networkPacks/NetPacksLib.cpp
View File

@@ -213,6 +213,11 @@ void ChangeFormation::visitTyped(ICPackVisitor & visitor)
visitor.visitChangeFormation(*this);
}
void ChangeTownName::visitTyped(ICPackVisitor & visitor)
{
visitor.visitChangeTownName(*this);
}
void RemoveObject::visitTyped(ICPackVisitor & visitor)
{
visitor.visitRemoveObject(*this);
@@ -643,6 +648,11 @@ void SetFormation::visitTyped(ICPackVisitor & visitor)
visitor.visitSetFormation(*this);
}
void SetTownName::visitTyped(ICPackVisitor & visitor)
{
visitor.visitSetTownName(*this);
}
void HireHero::visitTyped(ICPackVisitor & visitor)
{
visitor.visitHireHero(*this);

14
lib/networkPacks/PacksForClient.h
View File

@@ -616,6 +616,20 @@ struct DLL_LINKAGE ChangeFormation : public CPackForClient
}
};
struct DLL_LINKAGE ChangeTownName : public CPackForClient
{
ObjectInstanceID tid;
std::string name;
void visitTyped(ICPackVisitor & visitor) override;
template <typename Handler> void serialize(Handler & h)
{
h & tid;
h & name;
}
};
struct DLL_LINKAGE RemoveObject : public CPackForClient
{
RemoveObject() = default;

22
lib/networkPacks/PacksForServer.h
View File

@@ -609,6 +609,28 @@ struct DLL_LINKAGE SetFormation : public CPackForServer
}
};
struct DLL_LINKAGE SetTownName : public CPackForServer
{
SetTownName() = default;
;
SetTownName(const ObjectInstanceID & TID, std::string Name)
: tid(TID)
, name(Name)
{
}
ObjectInstanceID tid;
std::string name;
void visitTyped(ICPackVisitor & visitor) override;
template <typename Handler> void serialize(Handler & h)
{
h & static_cast<CPackForServer &>(*this);
h & tid;
h & name;
}
};
struct DLL_LINKAGE HireHero : public CPackForServer
{
HireHero() = default;