浏览代码

- fixed 578
- minor fix to hero window

Ivan Savenko 15 年之前
父节点
当前提交
1338340027
共有 2 个文件被更改,包括 5 次插入8 次删除
  1. 4 8
      client/CHeroWindow.cpp
  2. 1 0
      lib/RegisterTypes.cpp

+ 4 - 8
client/CHeroWindow.cpp

@@ -496,15 +496,11 @@ void CHeroWindow::redrawCurBack()
 	}
 
 	//secondary skills
-	for(int g=1; g<=8; ++g)
+	for(size_t v=0; v<std::min(secSkillAreas.size(), curHero->secSkills.size()); ++v)
 	{
-		
-		if(curHero->secSkills.size()>=g)
-		{
-			blitAt(graphics->abils44->ourImages[curHero->secSkills[g-1].first*3+3+curHero->secSkills[g-1].second-1].bitmap, g%2 ? 18 : 161, 276 + 48 * ((g-1)/2), curBack);
-			CSDL_Ext::printAt(CGI->generaltexth->levels[curHero->secSkills[g-1].second-1], g%2 ? 68 : 212, 280 + 48 * ((g-1)/2), FONT_SMALL, zwykly, curBack);
-			CSDL_Ext::printAt(CGI->generaltexth->skillName[curHero->secSkills[g-1].first], g%2 ? 68 : 212, 300 + 48 * ((g-1)/2), FONT_SMALL, zwykly, curBack);
-		}
+		blitAt(graphics->abils44->ourImages[curHero->secSkills[v].first*3+3+curHero->secSkills[v].second-1].bitmap, v%2 ? 161 : 18, 276 + 48 * (v/2), curBack);
+		CSDL_Ext::printAt(CGI->generaltexth->levels[curHero->secSkills[v].second-1], v%2 ? 212 : 68, 280 + 48 * (v/2), FONT_SMALL, zwykly, curBack);
+		CSDL_Ext::printAt(CGI->generaltexth->skillName[curHero->secSkills[v].first], v%2 ? 212 : 68, 300 + 48 * (v/2), FONT_SMALL, zwykly, curBack);
 	}
 
 	//printing special ability

+ 1 - 0
lib/RegisterTypes.cpp

@@ -65,6 +65,7 @@ void registerTypes1(Serializer &s)
 	s.template registerType<CGLighthouse>();
 	s.template registerType<CGMarket>();
 	s.template registerType<CGBlackMarket>();
+	s.template registerType<CGUniversity>();
 	//end of objects
 	s.template registerType<ILimiter>();
 	s.template registerType<CCreatureTypeLimiter>();