2
0
Эх сурвалжийг харах

Some more fixes for limiters and specialties.

DjWarmonger 12 жил өмнө
parent
commit
1e90de3c9f

+ 0 - 1
lib/CObjectHandler.cpp

@@ -1181,7 +1181,6 @@ void CGHeroInstance::Updatespecialty() //TODO: calculate special value of bonuse
 								param = creatures[b->additionalInfo]->Defense();
 								break;
 							default:
-								assert(0);
 								param = 0;
 						}
 						b->val = ceil(param * (1 + primSkillModifier)) - param; //yep, overcomplicated but matches original

+ 1 - 1
lib/CObjectHandler.h

@@ -328,7 +328,7 @@ public:
 
 	struct DLL_LINKAGE HeroSpecial : CBonusSystemNode
 	{
-		bool growsWithLevel;
+		ui8 growsWithLevel;
 
 		HeroSpecial(){growsWithLevel = false;};
 

+ 2 - 0
lib/JsonNode.cpp

@@ -1065,6 +1065,8 @@ Bonus * JsonUtils::parseBonus (const JsonNode &ability)
 							}
 							else
 								l2->includeUpgrades = false;
+
+							l = l2;
 						}
 						if (limiter["type"].String() == "HAS_ANOTHER_BONUS_LIMITER")
 						{