浏览代码

Replace more magic subIDs with readable enums

Arseniy Shestakov 9 年之前
父节点
当前提交
f6df107a55
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 4 4
      lib/mapObjects/CGTownInstance.cpp
  2. 2 2
      lib/mapObjects/MiscObjects.cpp

+ 4 - 4
lib/mapObjects/CGTownInstance.cpp

@@ -618,16 +618,16 @@ void CGTownInstance::initObj(CRandomGenerator & rand)
 
 	switch (subID)
 	{ //add new visitable objects
-		case 0:
+		case ETownType::CASTLE:
 			bonusingBuildings.push_back (new COPWBonus(BuildingID::STABLES, this));
 			break;
-		case 5:
+		case ETownType::DUNGEON:
 			bonusingBuildings.push_back (new COPWBonus(BuildingID::MANA_VORTEX, this));
 			//fallthrough
-		case 2: case 3: case 6:
+		case ETownType::TOWER: case ETownType::INFERNO: case ETownType::STRONGHOLD:
 			bonusingBuildings.push_back (new CTownBonus(BuildingID::SPECIAL_4, this));
 			break;
-		case 7:
+		case ETownType::FORTRESS:
 			bonusingBuildings.push_back (new CTownBonus(BuildingID::SPECIAL_1, this));
 			break;
 	}

+ 2 - 2
lib/mapObjects/MiscObjects.cpp

@@ -867,10 +867,10 @@ void CGResource::initObj(CRandomGenerator & rand)
 	{
 		switch(subID)
 		{
-		case 6:
+		case Res::GOLD:
 			amount = rand.nextInt(5, 10) * 100;
 			break;
-		case 0: case 2:
+		case Res::WOOD: case Res::ORE:
 			amount = rand.nextInt(6, 10);
 			break;
 		default: