瀏覽代碼

Warning fixes + typo.

Frank Zago 14 年之前
父節點
當前提交
129c9d521e
共有 4 個文件被更改,包括 8 次插入8 次删除
  1. 4 4
      AI/GeniusAI/AIPriorities.cpp
  2. 1 1
      lib/BattleState.h
  3. 1 1
      lib/CCreatureSet.cpp
  4. 2 2
      lib/IGameCallback.h

+ 4 - 4
AI/GeniusAI/AIPriorities.cpp

@@ -8,11 +8,11 @@ using namespace geniusai;
 Network::Network()
 {}
 Network::Network(vector<unsigned int> whichFeatures)// random network
-    : net(whichFeatures.size(),
+    : whichFeatures(whichFeatures),
+      net(whichFeatures.size(),
           whichFeatures.size() * 0.601 + 2,
           whichFeatures.size() * 0.251 + 2,
-          1),
-      whichFeatures(whichFeatures)
+          1)
 {
 }
 
@@ -250,4 +250,4 @@ float Priorities::getValue(const CGeniusAI::AIObjective & obj)
 
 	return 0;
 }
-#endif
+#endif

+ 1 - 1
lib/BattleState.h

@@ -206,7 +206,7 @@ public:
 			if(!army || slot == -1 || !army->hasStackAtSlot(slot))
 			{
 				base = NULL;
-				tlog3 << type->nameSing << " don't have a base stack!\n";
+				tlog3 << type->nameSing << " doesn't have a base stack!\n";
 			}
 			else
 			{

+ 1 - 1
lib/CCreatureSet.cpp

@@ -693,7 +693,7 @@ std::string CStackInstance::bonusToGraphics(Bonus *bonus) const
 		case Bonus::MAGIC_RESISTANCE:
 			fileName = "E_DWARF.bmp"; break;
 		case Bonus::SECONDARY_SKILL_PREMY:
-			if (bonus->subtype = CGHeroInstance::RESISTANCE)
+			if (bonus->subtype == CGHeroInstance::RESISTANCE)
 			{
 				fileName = "E_DWARF.bmp";
 			}

+ 2 - 2
lib/IGameCallback.h

@@ -54,7 +54,7 @@ class CSpell;
 class CCreatureSet;
 class CCreature;
 class CStackBasicDescriptor;
-class TeamState;
+struct TeamState;
 class CGCreature;
 
 
@@ -319,4 +319,4 @@ public:
 	friend struct CPackForClient;
 	friend struct CPackForServer;
 };
-#endif // __IGAMECALLBACK_H__
+#endif // __IGAMECALLBACK_H__