From 129c9d521ef3e0df1f2fff9a10fc220e8e3e3540 Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Sat, 18 Jun 2011 23:56:48 +0000 Subject: [PATCH] Warning fixes + typo. --- AI/GeniusAI/AIPriorities.cpp | 8 ++++---- lib/BattleState.h | 2 +- lib/CCreatureSet.cpp | 2 +- lib/IGameCallback.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AI/GeniusAI/AIPriorities.cpp b/AI/GeniusAI/AIPriorities.cpp index 7ae9af72b..3937646f0 100644 --- a/AI/GeniusAI/AIPriorities.cpp +++ b/AI/GeniusAI/AIPriorities.cpp @@ -8,11 +8,11 @@ using namespace geniusai; Network::Network() {} Network::Network(vector 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 \ No newline at end of file +#endif diff --git a/lib/BattleState.h b/lib/BattleState.h index 05ab5bd3b..4cd21e647 100644 --- a/lib/BattleState.h +++ b/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 { diff --git a/lib/CCreatureSet.cpp b/lib/CCreatureSet.cpp index 5acf4e996..e84dd0077 100644 --- a/lib/CCreatureSet.cpp +++ b/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"; } diff --git a/lib/IGameCallback.h b/lib/IGameCallback.h index 2c8e6a5d1..2c70c5346 100644 --- a/lib/IGameCallback.h +++ b/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__ \ No newline at end of file +#endif // __IGAMECALLBACK_H__