浏览代码

Fixed stacks speed and general parsing bug.

DjWarmonger 14 年之前
父节点
当前提交
6db068f506
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 0
      lib/CCreatureHandler.cpp
  2. 1 1
      lib/HeroBonus.cpp

+ 4 - 0
lib/CCreatureHandler.cpp

@@ -635,6 +635,7 @@ void CCreatureHandler::loadCreatures()
 		b.valType = Bonus::ADDITIVE_VALUE;
 		b.effectRange = Bonus::NO_LIMIT;
 		b.additionalInfo = 0;
+		b.turnsRemain = 0;
 		BonusList bl;
 
 		loadToIt (dump2, buf, it, 3); //ignore first line
@@ -886,6 +887,7 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
 				b.type = Bonus::UNDEAD; break;
 			default:
 			tlog3 << "Not parsed bonus " << buf << mod << "\n";
+				return;
 				break;
 		}
 		break;
@@ -934,6 +936,7 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
 				break;
 			default:
 				tlog3 << "Not parsed bonus " << buf << mod << "\n";
+				return;
 		}
 		break;
 
@@ -957,6 +960,7 @@ void CCreatureHandler::loadStackExp(Bonus & b, BonusList & bl, std::string & src
 		break;
 	default:
 		tlog3 << "Not parsed bonus " << buf << mod << "\n";
+		return;
 		break;
 	}
 	switch (mod[0])

+ 1 - 1
lib/HeroBonus.cpp

@@ -582,7 +582,7 @@ namespace Selector
 	DLL_EXPORT CSelectFieldEqual<si32> info(&Bonus::additionalInfo, 0);
 	DLL_EXPORT CSelectFieldEqual<ui8> sourceType(&Bonus::source, 0);
 	DLL_EXPORT CSelectFieldEqual<ui8> effectRange(&Bonus::effectRange, Bonus::NO_LIMIT);
-	DLL_EXPORT CWillLastTurns turns;;
+	DLL_EXPORT CWillLastTurns turns;
 
 	CSelector DLL_EXPORT typeSybtype(TBonusType Type, TBonusSubtype Subtype)
 	{