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

Cleaned up dwelling randomization

Browse Source
This commit is contained in:
Ivan Savenko
2023-10-25 21:56:00 +03:00
parent dcb8f4fc7b
commit 7a09646009
12 changed files with 69 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/CGDwelling.cpp
View File

@@ -48,6 +48,10 @@ CGDwelling::~CGDwelling() = default;
FactionID CGDwelling::randomizeFaction(CRandomGenerator & rand)
{
if (ID == Obj::RANDOM_DWELLING_FACTION)
return FactionID(subID);
assert(ID == Obj::RANDOM_DWELLING || ID == Obj::RANDOM_DWELLING_LVL);
assert(randomizationInfo.has_value());
if (!randomizationInfo)
return FactionID::CASTLE;
@@ -102,6 +106,10 @@ FactionID CGDwelling::randomizeFaction(CRandomGenerator & rand)
int CGDwelling::randomizeLevel(CRandomGenerator & rand)
{
if (ID == Obj::RANDOM_DWELLING_LVL)
return subID.getNum();
assert(ID == Obj::RANDOM_DWELLING || ID == Obj::RANDOM_DWELLING_FACTION);
assert(randomizationInfo.has_value());
if (!randomizationInfo)