games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Renamed enum EMonsterStrength to EGlobalMonsterStrength. Enum EZoneMonsterStrength unchanged.

Browse Source
This commit is contained in:
Warzyw647 2023-05-06 12:18:53 +02:00
parent 7f180b6e81
commit d74fdad432
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/lobby/RandomMapTab.cpp
View File

@ -93,9 +93,9 @@ RandomMapTab::RandomMapTab():
addCallback("setMonsterStrength", [&](int btnId)
{
if(btnId < 0)
mapGenOptions->setMonsterStrength(EMonsterStrength::RANDOM);
mapGenOptions->setMonsterStrength(EGlobalMonsterStrength::RANDOM);
else
mapGenOptions->setMonsterStrength(static_cast<EMonsterStrength::EMonsterStrength>(btnId)); //value 2 to 4
mapGenOptions->setMonsterStrength(static_cast<EGlobalMonsterStrength::EGlobalMonsterStrength>(btnId)); //value 2 to 4
updateMapInfoByHost();
});

12
lib/rmg/CMapGenOptions.cpp
View File

@ -23,7 +23,7 @@ VCMI_LIB_NAMESPACE_BEGIN
CMapGenOptions::CMapGenOptions()
: width(CMapHeader::MAP_SIZE_MIDDLE), height(CMapHeader::MAP_SIZE_MIDDLE), hasTwoLevels(true),
playerCount(RANDOM_SIZE), teamCount(RANDOM_SIZE), compOnlyPlayerCount(RANDOM_SIZE), compOnlyTeamCount(RANDOM_SIZE),
waterContent(EWaterContent::RANDOM), monsterStrength(EMonsterStrength::RANDOM), mapTemplate(nullptr)
waterContent(EWaterContent::RANDOM), monsterStrength(EGlobalMonsterStrength::RANDOM), mapTemplate(nullptr)
{
resetPlayersMap();
}
@ -122,12 +122,12 @@ void CMapGenOptions::setWaterContent(EWaterContent::EWaterContent value)
waterContent = value;
}
EMonsterStrength::EMonsterStrength CMapGenOptions::getMonsterStrength() const
EGlobalMonsterStrength::EGlobalMonsterStrength CMapGenOptions::getMonsterStrength() const
{
return monsterStrength;
}
void CMapGenOptions::setMonsterStrength(EMonsterStrength::EMonsterStrength value)
void CMapGenOptions::setMonsterStrength(EGlobalMonsterStrength::EGlobalMonsterStrength value)
{
monsterStrength = value;
}
@ -308,13 +308,13 @@ void CMapGenOptions::finalize(CRandomGenerator & rand)
}
}
if(monsterStrength == EMonsterStrength::RANDOM)
if(monsterStrength == EGlobalMonsterStrength::RANDOM)
{
monsterStrength = static_cast<EMonsterStrength::EMonsterStrength>(rand.nextInt(EMonsterStrength::WEAK, EMonsterStrength::STRONG));
monsterStrength = static_cast<EGlobalMonsterStrength::EGlobalMonsterStrength>(rand.nextInt(EGlobalMonsterStrength::WEAK, EGlobalMonsterStrength::STRONG));
}
assert (vstd::iswithin(waterContent, EWaterContent::NONE, EWaterContent::ISLANDS));
assert (vstd::iswithin(monsterStrength, EMonsterStrength::WEAK, EMonsterStrength::STRONG));
assert (vstd::iswithin(monsterStrength, EGlobalMonsterStrength::WEAK, EGlobalMonsterStrength::STRONG));
//rectangular maps are the future of gaming

6
lib/rmg/CMapGenOptions.h
View File

@ -110,8 +110,8 @@ public:
EWaterContent::EWaterContent getWaterContent() const;
void setWaterContent(EWaterContent::EWaterContent value);
EMonsterStrength::EMonsterStrength getMonsterStrength() const;
void setMonsterStrength(EMonsterStrength::EMonsterStrength value);
EGlobalMonsterStrength::EGlobalMonsterStrength getMonsterStrength() const;
void setMonsterStrength(EGlobalMonsterStrength::EGlobalMonsterStrength value);
bool isRoadEnabled(const std::string & roadName) const;
void setRoadEnabled(const std::string & roadName, bool enable);
@ -157,7 +157,7 @@ private:
bool hasTwoLevels;
si8 playerCount, teamCount, compOnlyPlayerCount, compOnlyTeamCount;
EWaterContent::EWaterContent waterContent;
EMonsterStrength::EMonsterStrength monsterStrength;
EGlobalMonsterStrength::EGlobalMonsterStrength monsterStrength;
std::map<PlayerColor, CPlayerSettings> players;
std::set<std::string> disabledRoads;

2
lib/rmg/CMapGenerator.cpp
View File

@ -151,7 +151,7 @@ std::string CMapGenerator::getMapDescription() const
const std::string waterContentStr[3] = { "none", "normal", "islands" };
const std::string monsterStrengthStr[3] = { "weak", "normal", "strong" };
int monsterStrengthIndex = mapGenOptions.getMonsterStrength() - EMonsterStrength::WEAK; //does not start from 0
int monsterStrengthIndex = mapGenOptions.getMonsterStrength() - EGlobalMonsterStrength::WEAK; //does not start from 0
const auto * mapTemplate = mapGenOptions.getMapTemplate();
if(!mapTemplate)

6
lib/rmg/CRmgTemplate.h
View File

@ -41,7 +41,7 @@ namespace EWaterContent
};
}
namespace EZoneMonsterStrength
namespace EZoneMonsterStrength // used as int in monster generation procedure
{
enum EZoneMonsterStrength
{
@ -51,9 +51,9 @@ namespace EZoneMonsterStrength
};
}
namespace EMonsterStrength
namespace EGlobalMonsterStrength // used as int in monster generation procedure and in map description for the generated random map
{
enum EMonsterStrength
enum EGlobalMonsterStrength
{
RANDOM = -1,
WEAK = 2,

28
mapeditor/windownewmap.cpp
View File

@ -141,13 +141,13 @@ void WindowNewMap::loadUserSettings()
{
switch (monsterStrength.toInt())
{
case EMonsterStrength::RANDOM:
case EGlobalMonsterStrength::RANDOM:
ui->monsterOpt1->setChecked(true); break;
case EMonsterStrength::WEAK:
case EGlobalMonsterStrength::WEAK:
ui->monsterOpt2->setChecked(true); break;
case EMonsterStrength::NORMAL:
case EGlobalMonsterStrength::NORMAL:
ui->monsterOpt3->setChecked(true); break;
case EMonsterStrength::STRONG:
case EGlobalMonsterStrength::STRONG:
ui->monsterOpt4->setChecked(true); break;
}
}
@ -195,15 +195,15 @@ void WindowNewMap::saveUserSettings()
water = EWaterContent::ISLANDS;
s.setValue(newMapWaterContent, static_cast<int>(water));
EMonsterStrength::EMonsterStrength monster = EMonsterStrength::RANDOM;
EGlobalMonsterStrength::EGlobalMonsterStrength monster = EGlobalMonsterStrength::RANDOM;
if(ui->monsterOpt1->isChecked())
monster = EMonsterStrength::RANDOM;
monster = EGlobalMonsterStrength::RANDOM;
else if(ui->monsterOpt2->isChecked())
monster = EMonsterStrength::WEAK;
monster = EGlobalMonsterStrength::WEAK;
else if(ui->monsterOpt3->isChecked())
monster = EMonsterStrength::NORMAL;
monster = EGlobalMonsterStrength::NORMAL;
else if(ui->monsterOpt4->isChecked())
monster = EMonsterStrength::STRONG;
monster = EGlobalMonsterStrength::STRONG;
s.setValue(newMapMonsterStrength, static_cast<int>(monster));
auto templateName = ui->templateCombo->currentText();
@ -240,7 +240,7 @@ std::unique_ptr<CMap> generateEmptyMap(CMapGenOptions & options)
void WindowNewMap::on_okButton_clicked()
{
EWaterContent::EWaterContent water = EWaterContent::RANDOM;
EMonsterStrength::EMonsterStrength monster = EMonsterStrength::RANDOM;
EGlobalMonsterStrength::EGlobalMonsterStrength monster = EGlobalMonsterStrength::RANDOM;
if(ui->waterOpt1->isChecked())
water = EWaterContent::RANDOM;
if(ui->waterOpt2->isChecked())
@ -250,13 +250,13 @@ void WindowNewMap::on_okButton_clicked()
if(ui->waterOpt4->isChecked())
water = EWaterContent::ISLANDS;
if(ui->monsterOpt1->isChecked())
monster = EMonsterStrength::RANDOM;
monster = EGlobalMonsterStrength::RANDOM;
if(ui->monsterOpt2->isChecked())
monster = EMonsterStrength::WEAK;
monster = EGlobalMonsterStrength::WEAK;
if(ui->monsterOpt3->isChecked())
monster = EMonsterStrength::NORMAL;
monster = EGlobalMonsterStrength::NORMAL;
if(ui->monsterOpt4->isChecked())
monster = EMonsterStrength::STRONG;
monster = EGlobalMonsterStrength::STRONG;
mapGenOptions.setWaterContent(water);
mapGenOptions.setMonsterStrength(monster);