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

code review

Browse Source
This commit is contained in:
Laserlicht
2024-07-29 22:54:42 +02:00
parent 6adc49b814
commit 3e5df61946
13 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/StartInfo.h
View File

@@ -66,6 +66,20 @@ enum class PlayerStartingBonus : int8_t
RESOURCE = 2
};
struct DLL_LINKAGE Handicap {
TResources startBonus = TResources();
int percentIncome = 100;
int percentGrowth = 100;
template <typename Handler>
void serialize(Handler &h)
{
h & startBonus;
h & percentIncome;
h & percentGrowth;
}
};
/// Struct which describes the name, the color, the starting bonus of a player
struct DLL_LINKAGE PlayerSettings
{
@@ -78,13 +92,8 @@ struct DLL_LINKAGE PlayerSettings
std::string heroNameTextId;
PlayerColor color; //from 0 -
enum EHandicap {NO_HANDICAP, MILD, SEVERE};
EHandicap handicapLegacy;//0-no, 1-mild, 2-severe
struct Handicap {
TResources startBonus;
int percentIncome;
int percentGrowth;
} handicap;
Handicap handicap;
std::string name;
std::set<ui8> connectedPlayerIDs; //Empty - AI, or connectrd player ids
@@ -99,13 +108,13 @@ struct DLL_LINKAGE PlayerSettings
h & bonus;
h & color;
if (h.version >= Handler::Version::PLAYER_HANDICAP)
{
h & handicap.startBonus;
h & handicap.percentIncome;
h & handicap.percentGrowth;
}
h & handicap;
else
{
enum EHandicap {NO_HANDICAP, MILD, SEVERE};
EHandicap handicapLegacy;
h & handicapLegacy;
}
h & name;
h & connectedPlayerIDs;
h & compOnly;