Merge pull request #3530 from Laserlicht/tavern

Invite hero
This commit is contained in:
Ivan Savenko
2024-01-26 13:12:55 +02:00
committed by GitHub
15 changed files with 152 additions and 23 deletions
+4 -1
View File
@@ -516,12 +516,14 @@ struct DLL_LINKAGE SetFormation : public CPackForServer
struct DLL_LINKAGE HireHero : public CPackForServer
{
HireHero() = default;
HireHero(HeroTypeID HID, const ObjectInstanceID & TID)
HireHero(HeroTypeID HID, const ObjectInstanceID & TID, const HeroTypeID & NHID)
: hid(HID)
, tid(TID)
, nhid(NHID)
{
}
HeroTypeID hid; //available hero serial
HeroTypeID nhid; //next hero
ObjectInstanceID tid; //town (tavern) id
PlayerColor player;
@@ -531,6 +533,7 @@ struct DLL_LINKAGE HireHero : public CPackForServer
{
h & static_cast<CPackForServer &>(*this);
h & hid;
h & nhid;
h & tid;
h & player;
}