Prepared for 1.01 release with life fixes

ciplogic · Sep 11, 2018 · faac6ea · faac6ea
1 parent e04beeb
commit faac6ea
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 22 deletions.
diff --git a/src/Installer/Installer/fh2enh.zip b/src/Installer/Installer/fh2enh.zip
diff --git a/src/fheroes2/army/army_troop.cpp b/src/fheroes2/army/army_troop.cpp
@@ -178,7 +178,7 @@ string Troop::GetSpeedString() const
     return Speed::String(GetSpeed());
 }
 
-uint32_t Troop::GetHitPointsLeft()
+uint32_t Troop::GetHitPointsLeft() const
 {
     return 0;
 }
@@ -188,7 +188,7 @@ uint32_t Troop::GetSpeed() const
     return _monster.GetSpeed();
 }
 
-uint32_t Troop::GetAffectedDuration(uint32_t)
+uint32_t Troop::GetAffectedDuration(uint32_t) const
 {
     return 0;
 }

diff --git a/src/fheroes2/army/army_troop.h b/src/fheroes2/army/army_troop.h
@@ -88,11 +88,11 @@ class Troop
 
     string GetSpeedString() const;
 
-    static uint32_t GetHitPointsLeft();
+    virtual uint32_t GetHitPointsLeft() const;
 
     uint32_t GetSpeed() const;
 
-    static uint32_t GetAffectedDuration(uint32_t);
+    virtual uint32_t GetAffectedDuration(uint32_t) const;
 
 protected:
     friend ByteVectorWriter& operator<<(ByteVectorWriter&, const Troop&);

diff --git a/src/fheroes2/battle/battle_troop.cpp b/src/fheroes2/battle/battle_troop.cpp
@@ -558,7 +558,8 @@ uint32_t Battle::Unit::GetDead() const
 
 uint32_t Battle::Unit::GetHitPointsLeft() const
 {
-    return GetHitPointsTroop() - (GetCount() - 1) * _monster.GetHitPoints();
+    const auto monsterLife = _monster.GetHitPoints();
+    return hp-monsterLife*(count-1);
 }
 
 uint32_t Battle::Unit::GetAffectedDuration(uint32_t mod) const

diff --git a/src/fheroes2/game/fheroes2.cpp b/src/fheroes2/game/fheroes2.cpp
@@ -201,7 +201,7 @@ int main(int argc, char **argv)
 
         try
         {
-            AGG::GetICN(ICN::ADVMCO, 0);
+            AGG::GetICN(ICN::DRAGRED, 0);
         }
         catch (...)
         {
@@ -214,7 +214,7 @@ int main(int argc, char **argv)
 
             return -1;
         }
-        extractFrames();
+        //extractFrames();
         conf.SetBlitSpeed(TestBlitSpeed());
 
         // init cursor

diff --git a/src/fheroes2/system/gamedefs.h b/src/fheroes2/system/gamedefs.h
@@ -21,11 +21,6 @@
  ***************************************************************************/
 #pragma once
 
-#include <memory>
-
-#define MAJOR_VERSION 1
-#define MINOR_VERSION 0
-
 #include "translations.h"
 #include <memory>
 

diff --git a/src/fheroes2/system/settings.cpp b/src/fheroes2/system/settings.cpp
@@ -221,16 +221,7 @@ const settings_t settingsFHeroes2[] =
 
 string Settings::GetVersion()
 {
-    ostringstream os;
-
-    os << static_cast<int>(MAJOR_VERSION) << "." << static_cast<int>(MINOR_VERSION) << "."
-#ifdef SVN_REVISION
-            SVN_REVISION;
-#else
-        "0000";
-#endif
-
-    return os.str();
+    return "1.01";
 }
 
 /* constructor */