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 branch 'develop' into patch-4map_overview_rework

Browse Source
This commit is contained in:
Laserlicht
2023-10-02 21:03:16 +02:00
committed by GitHub
parent 12ca3ea0ec 80be1e9f4c
commit ec8580b99e
106 changed files with 2002 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/StartInfo.h
View File

@@ -59,7 +59,7 @@ struct DLL_LINKAGE PlayerSettings
HeroTypeID hero;
HeroTypeID heroPortrait; //-1 if default, else ID
std::string heroName;
std::string heroNameTextId;
PlayerColor color; //from 0 -
enum EHandicap {NO_HANDICAP, MILD, SEVERE};
EHandicap handicap;//0-no, 1-mild, 2-severe
@@ -73,7 +73,7 @@ struct DLL_LINKAGE PlayerSettings
h & castle;
h & hero;
h & heroPortrait;
h & heroName;
h & heroNameTextId;
h & bonus;
h & color;
h & handicap;