Skip to content

Commit

Permalink
Prepared for 1.01 release with life fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ciplogic committed Sep 11, 2018
1 parent e04beeb commit faac6ea
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 22 deletions.
Binary file modified src/Installer/Installer/fh2enh.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions src/fheroes2/army/army_troop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ string Troop::GetSpeedString() const
return Speed::String(GetSpeed());
}

uint32_t Troop::GetHitPointsLeft()
uint32_t Troop::GetHitPointsLeft() const
{
return 0;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/fheroes2/army/army_troop.h
Original file line number Diff line number Diff line change
Expand Up @@ -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&);
Expand Down
3 changes: 2 additions & 1 deletion src/fheroes2/battle/battle_troop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/fheroes2/game/fheroes2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ int main(int argc, char **argv)

try
{
AGG::GetICN(ICN::ADVMCO, 0);
AGG::GetICN(ICN::DRAGRED, 0);
}
catch (...)
{
Expand All @@ -214,7 +214,7 @@ int main(int argc, char **argv)

return -1;
}
extractFrames();
//extractFrames();
conf.SetBlitSpeed(TestBlitSpeed());

// init cursor
Expand Down
5 changes: 0 additions & 5 deletions src/fheroes2/system/gamedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
***************************************************************************/
#pragma once

#include <memory>

#define MAJOR_VERSION 1
#define MINOR_VERSION 0

#include "translations.h"
#include <memory>

Expand Down
11 changes: 1 addition & 10 deletions src/fheroes2/system/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit faac6ea

Please sign in to comment.