1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00

merge conflict regression fix

This commit is contained in:
Andrii Danylchenko
2023-02-18 14:32:30 +02:00
committed by Andrii Danylchenko
parent 3033b9751e
commit e13a230848

View File

@@ -350,6 +350,7 @@ struct DLL_LINKAGE SetAvailableHeroes : public CPackForClient
struct DLL_LINKAGE GiveBonus : public CPackForClient
{
GiveBonus(ui8 Who = 0)
:who(Who)
{
}
@@ -426,6 +427,7 @@ struct DLL_LINKAGE PlayerReinitInterface : public CPackForClient
struct DLL_LINKAGE RemoveBonus : public CPackForClient
{
RemoveBonus(ui8 Who = 0)
:who(Who)
{
}