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

Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-07-16 18:54:50 +02:00
parent a200e87640 a4ba5a9b65
commit bda126a1fd
76 changed files with 1970 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapping/CMap.h
View File

@@ -56,10 +56,10 @@ struct DLL_LINKAGE DisposedHero
{
DisposedHero();
ui32 heroId;
ui32 portrait; /// The portrait id of the hero, -1 is default.
HeroTypeID heroId;
HeroTypeID portrait; /// The portrait id of the hero, -1 is default.
std::string name;
ui8 players; /// Who can hire this hero (bitfield).
PlayerColor::Mask players; /// Who can hire this hero (bitfield).
template <typename Handler>
void serialize(Handler & h, const int version)