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

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

Browse Source 
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
This commit is contained in:
Tomasz Zieliński
2023-11-07 20:54:04 +01:00
parent 6e7b68d0e6 3fe10f9c7b
commit c909bd766e
159 changed files with 1727 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rmg/CMapGenOptions.h
View File

@@ -42,8 +42,8 @@ public:
/// The starting town of the player ranging from 0 to town max count or RANDOM_TOWN.
/// The default value is RANDOM_TOWN.
si32 getStartingTown() const;
void setStartingTown(si32 value);
FactionID getStartingTown() const;
void setStartingTown(FactionID value);
/// The default value is EPlayerType::AI.
EPlayerType getPlayerType() const;
@@ -55,7 +55,7 @@ public:
private:
PlayerColor color;
si32 startingTown;
FactionID startingTown;
EPlayerType playerType;
TeamID team;
@@ -118,8 +118,7 @@ public:
/// The first player colors belong to standard players and the last player colors belong to comp only players.
/// All standard players are by default of type EPlayerType::AI.
const std::map<PlayerColor, CPlayerSettings> & getPlayersSettings() const;
const std::map<PlayerColor, CPlayerSettings> & getSavedPlayersMap() const;
void setStartingTownForPlayer(const PlayerColor & color, si32 town);
void setStartingTownForPlayer(const PlayerColor & color, FactionID town);
/// Sets a player type for a standard player. A standard player is the opposite of a computer only player. The
/// values which can be chosen for the player type are EPlayerType::AI or EPlayerType::HUMAN.
void setPlayerTypeForStandardPlayer(const PlayerColor & color, EPlayerType playerType);