ihhub · ihhub · May 15, 2021 · May 15, 2021 · May 15, 2021 · May 15, 2021
diff --git a/VisualStudio/common.props b/VisualStudio/common.props
@@ -12,7 +12,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\src\engine;$(MSBuildThisFileDirectory)..\src\fheroes2\gui;$(MSBuildThisFileDirectory)..\src\fheroes2\maps;$(MSBuildThisFileDirectory)..\src\fheroes2\kingdom;$(MSBuildThisFileDirectory)..\src\fheroes2\campaign;$(MSBuildThisFileDirectory)..\src\fheroes2\game;$(MSBuildThisFileDirectory)..\src\fheroes2\dialog;$(MSBuildThisFileDirectory)..\src\fheroes2\system;$(MSBuildThisFileDirectory)..\src\fheroes2\spell;$(MSBuildThisFileDirectory)..\src\fheroes2\monster;$(MSBuildThisFileDirectory)..\src\fheroes2\castle;$(MSBuildThisFileDirectory)..\src\fheroes2\agg;$(MSBuildThisFileDirectory)..\src\fheroes2\heroes;$(MSBuildThisFileDirectory)..\src\fheroes2\resource;$(MSBuildThisFileDirectory)..\src\fheroes2\ai;$(MSBuildThisFileDirectory)..\src\fheroes2\army;$(MSBuildThisFileDirectory)..\src\fheroes2\battle;$(MSBuildThisFileDirectory)..\src\fheroes2\pocketpc;$(MSBuildThisFileDirectory)..\src\fheroes2\objects;$(MSBuildThisFileDirectory)..\src\fheroes2\world;$(MSBuildThisFileDirectory)..\src\fheroes2\image;$(MSBuildThisFileDirectory)..\src\thirdparty\libsmacker;$(MSBuildThisFileDirectory)packages\installed\zlib\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;WITH_ZLIB;WITH_MIXER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TreatSpecificWarningsAsErrors>4018;4100;4189;4309;4319;4389;4592;4715;4800</TreatSpecificWarningsAsErrors>
+      <TreatSpecificWarningsAsErrors>4018;4100;4189;4309;4319;4389;4592;4702;4715;4800</TreatSpecificWarningsAsErrors>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\src\fheroes2\system;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

diff --git a/src/engine/image.cpp b/src/engine/image.cpp
@@ -936,12 +936,12 @@ namespace fheroes2
 
     void Blit( const Image & in, int32_t inX, int32_t inY, Image & out, int32_t outX, int32_t outY, int32_t width, int32_t height, bool flip )
     {
-        if ( !Verify( in, inX, inY, out, outX, outY, width, height ) ) {
+        if ( in.singleLayer() && out.singleLayer() && !flip ) {
+            Copy( in, inX, inY, out, outX, outY, width, height );
             return;
         }
 
-        if ( in.singleLayer() && out.singleLayer() && !flip ) {
-            Copy( in, inX, inY, out, outX, outY, width, height );
+        if ( !Verify( in, inX, inY, out, outX, outY, width, height ) ) {
             return;
         }
 

diff --git a/src/engine/image.h b/src/engine/image.h
@@ -19,8 +19,8 @@
  ***************************************************************************/
 #pragma once
 
+#include <cstdint>
 #include <memory>
-#include <stdint.h>
 #include <string>
 #include <vector>
 

diff --git a/src/engine/localevent.cpp b/src/engine/localevent.cpp
@@ -1102,7 +1102,19 @@ LocalEvent & LocalEvent::GetClean()
 bool LocalEvent::HandleEvents( bool delay, bool allowExit )
 {
     if ( colorCycling.isRedrawRequired() ) {
-        fheroes2::Display::instance().render();
+        // Looks like there is no explicit rendering so the code for color cycling was executed here.
+        if ( delay ) {
+            fheroes2::Time timeCheck;
+            fheroes2::Display::instance().render();
+
+            if ( timeCheck.getMs() > loop_delay ) {
+                // Since rendering took more than waiting time so we should not wait.
+                delay = false;
+            }
+        }
+        else {
+            fheroes2::Display::instance().render();
+        }
     }
 
     SDL_Event event;

diff --git a/src/engine/localevent.h b/src/engine/localevent.h
@@ -328,7 +328,7 @@ class LocalEvent
     void ( *redraw_cursor_func )( s32, s32 );
     void ( *keyboard_filter_func )( int, int );
 
-    int loop_delay;
+    uint32_t loop_delay;
 
     // These members are used for restoring music and sounds when an user reopens the window
     bool _isHiddenWindow;

diff --git a/src/engine/math_base.h b/src/engine/math_base.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <cmath>
-#include <stdint.h>
+#include <cstdint>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846

diff --git a/src/engine/pal.h b/src/engine/pal.h
@@ -20,7 +20,7 @@
 #ifndef H2PAL_H
 #define H2PAL_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 namespace PAL

diff --git a/src/engine/serialize.cpp b/src/engine/serialize.cpp
@@ -401,7 +401,7 @@ void StreamBuf::put8( char v )
 u8 StreamBuf::get8()
 {
     if ( sizeg() )
-        return static_cast<u8>( 255u ) & *itget++;
+        return *itget++;
     else
         return 0u;
 }

diff --git a/src/engine/timing.h b/src/engine/timing.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include <chrono>
-#include <stdint.h>
+#include <cstdint>
 
 namespace fheroes2
 {

diff --git a/src/engine/tools.cpp b/src/engine/tools.cpp
@@ -28,7 +28,6 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <math.h>
 #include <sstream>
 
 #include "logging.h"

diff --git a/src/fheroes2/agg/agg_image.cpp b/src/fheroes2/agg/agg_image.cpp
@@ -820,6 +820,13 @@ namespace fheroes2
 
                 return true;
             }
+            case ICN::HEROES:
+                LoadOriginalICN( id );
+                if ( !_icnVsSprite[id].empty() ) {
+                    // This is main menu image which doesn't shouldn't have any transform layer.
+                    _icnVsSprite[id][0]._disableTransformLayer();
+                }
+                return true;
             default:
                 break;
             }

diff --git a/src/fheroes2/ai/ai.h b/src/fheroes2/ai/ai.h
@@ -67,7 +67,7 @@ namespace AI
     {
     public:
         virtual void KingdomTurn( Kingdom & kingdom );
-        virtual void CastleTurn( Castle & castle, bool defensive = false );
+        virtual void CastleTurn( Castle & castle, bool defensive );
         virtual void BattleTurn( Battle::Arena & arena, const Battle::Unit & unit, Battle::Actions & actions );
         virtual void HeroTurn( Heroes & hero );
         virtual void HeroesTurn( VecHeroes & ) {}

diff --git a/src/fheroes2/ai/ai_base.cpp b/src/fheroes2/ai/ai_base.cpp
@@ -174,7 +174,7 @@ namespace AI
         // castles AI turn
         for ( KingdomCastles::iterator it = castles.begin(); it != castles.end(); ++it )
             if ( *it )
-                CastleTurn( **it );
+                CastleTurn( **it, false );
 
         status.RedrawTurnProgress( 3 );
 

diff --git a/src/fheroes2/ai/normal/ai_normal.h b/src/fheroes2/ai/normal/ai_normal.h
@@ -119,7 +119,7 @@ namespace AI
     public:
         Normal();
         void KingdomTurn( Kingdom & kingdom ) override;
-        void CastleTurn( Castle & castle, bool defensive = false ) override;
+        void CastleTurn( Castle & castle, bool defensive ) override;
         void BattleTurn( Battle::Arena & arena, const Battle::Unit & currentUnit, Battle::Actions & actions ) override;
         void HeroesTurn( VecHeroes & heroes ) override;
 

diff --git a/src/fheroes2/army/army.cpp b/src/fheroes2/army/army.cpp
@@ -21,8 +21,8 @@
  ***************************************************************************/
 
 #include <algorithm>
+#include <cmath>
 #include <functional>
-#include <math.h>
 #include <set>
 
 #include "agg_image.h"
@@ -1561,7 +1561,7 @@ Monster Army::GetStrongestMonster() const
     Monster monster( Monster::UNKNOWN );
     for ( const Troop * troop : *this ) {
         if ( troop->isValid() && troop->GetMonster().GetMonsterStrength() > monster.GetMonsterStrength() ) {
-            monster = *troop;
+            monster = troop->GetID();
         }
     }
     return monster;

diff --git a/src/fheroes2/battle/battle_interface.cpp b/src/fheroes2/battle/battle_interface.cpp
@@ -896,6 +896,9 @@ Battle::Interface::Interface( Arena & a, s32 center )
     , teleport_src( -1 )
     , listlog( NULL )
 {
+    // Since this surface is going to be copied directly on screen it shouldn't have any transform layer.
+    _mainSurface._disableTransformLayer();
+
     const Settings & conf = Settings::Get();
 
     Cursor::Get().Hide();

diff --git a/src/fheroes2/dialog/dialog_thievesguild.cpp b/src/fheroes2/dialog/dialog_thievesguild.cpp
@@ -260,7 +260,7 @@ void DrawHeroStats( const std::vector<ValueColors> & v, const fheroes2::Point &
     }
 }
 
-void DrawPersonality( const Colors & colors, fheroes2::Point & pos, int step )
+void DrawPersonality( const Colors & colors, const fheroes2::Point & pos, int step )
 {
     for ( size_t i = 0; i < colors.size(); ++i ) {
         const Player * player = Players::Get( colors[i] );
@@ -269,7 +269,7 @@ void DrawPersonality( const Colors & colors, fheroes2::Point & pos, int step )
     }
 }
 
-void DrawBestMonsterIcons( const Colors & colors, fheroes2::Point & pos, int step )
+void DrawBestMonsterIcons( const Colors & colors, const fheroes2::Point & pos, int step )
 {
     for ( size_t i = 0; i < colors.size(); ++i ) {
         const Monster monster = world.GetKingdom( colors[i] ).GetStrongestMonster();

diff --git a/src/fheroes2/game/fheroes2.cpp b/src/fheroes2/game/fheroes2.cpp
@@ -156,9 +156,8 @@ int main( int argc, char ** argv )
 
             SDL_ShowCursor( SDL_DISABLE ); // hide system cursor
 
-            // Ensure the mouse position is updated to prevent bad initial values.
+            // Initialize local event processing.
             LocalEvent::Get().RegisterCycling( fheroes2::PreRenderSystemInfo, fheroes2::PostRenderSystemInfo );
-            LocalEvent::Get().GetMouseCursor();
 
             // Update mouse cursor when switching between software emulation and OS mouse modes.
             fheroes2::cursor().registerUpdater( Cursor::Refresh );

diff --git a/src/fheroes2/game/game_delays.h b/src/fheroes2/game/game_delays.h
@@ -21,7 +21,7 @@
 #ifndef H2GAME_DELAYS_H
 #define H2GAME_DELAYS_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 namespace Game

diff --git a/src/fheroes2/game/game_io.cpp b/src/fheroes2/game/game_io.cpp
@@ -59,7 +59,9 @@ namespace Game
             IS_LOYALTY = 0x4000
         };
 
-        HeaderSAV( const int saveFileVersion )
+        HeaderSAV() = delete;
+
+        explicit HeaderSAV( const int saveFileVersion )
             : status( 0 )
             , gameType( 0 )
             , _saveFileVersion( saveFileVersion )

diff --git a/src/fheroes2/game/game_startgame.cpp b/src/fheroes2/game/game_startgame.cpp
@@ -24,10 +24,6 @@
 #include <cassert>
 #include <vector>
 
-#ifdef AI
-#undef AI
-#endif
-
 #include "agg.h"
 #include "agg_image.h"
 #include "ai.h"

diff --git a/src/fheroes2/gui/cursor.cpp b/src/fheroes2/gui/cursor.cpp
@@ -67,7 +67,7 @@ bool Cursor::SetThemes( int name, bool force )
         fheroes2::cursor().update( spr, -offset_x, -offset_y );
 
         // immediately apply new offset, force
-        const fheroes2::Point currentPos = LocalEvent::Get().GetMouseCursor();
+        const fheroes2::Point & currentPos = LocalEvent::Get().GetMouseCursor();
         Move( currentPos.x, currentPos.y );
         return true;
     }

diff --git a/src/fheroes2/gui/interface_events.cpp b/src/fheroes2/gui/interface_events.cpp
@@ -59,7 +59,7 @@ void Interface::Basic::CalculateHeroPath( Heroes * hero, s32 destinationIdx ) co
         gameArea.SetRedraw();
 
         LocalEvent & le = LocalEvent::Get();
-        const fheroes2::Point mousePos = le.GetMouseCursor();
+        const fheroes2::Point & mousePos = le.GetMouseCursor();
         if ( gameArea.GetROI() & mousePos ) {
             const int32_t cursorIndex = gameArea.GetValidTileIdFromPoint( mousePos );
             Cursor::Get().SetThemes( GetCursorTileIndex( cursorIndex ) );

diff --git a/src/fheroes2/image/embedded_image.h b/src/fheroes2/image/embedded_image.h
@@ -22,7 +22,7 @@
 
 #ifdef WITH_ZLIB
 
-#include <stdint.h>
+#include <cstdint>
 
 const uint8_t errorMessage[]
     = { 0x78, 0x9c, 0xed, 0x9d, 0x0d, 0x7a, 0xa4, 0x38, 0x92, 0x86, 0x4f, 0xb2, 0xdd, 0x4e, 0x5f, 0x61, 0x0b, 0x04, 0x02, 0xdf, 0xa9, 0x0d, 0xcb, 0x8f, 0x40, 0xc2, 0xd3,

diff --git a/src/fheroes2/kingdom/kingdom_overview.cpp b/src/fheroes2/kingdom/kingdom_overview.cpp
@@ -94,7 +94,7 @@ struct HeroRow
 class StatsHeroesList : public Interface::ListBox<HeroRow>
 {
 public:
-    StatsHeroesList( const fheroes2::Point & pt, KingdomHeroes & );
+    StatsHeroesList( const fheroes2::Point & pt, const KingdomHeroes & );
 
     bool Refresh( KingdomHeroes & heroes );
 
@@ -118,7 +118,7 @@ class StatsHeroesList : public Interface::ListBox<HeroRow>
     void SetContent( const KingdomHeroes & heroes );
 };
 
-StatsHeroesList::StatsHeroesList( const fheroes2::Point & pt, KingdomHeroes & heroes )
+StatsHeroesList::StatsHeroesList( const fheroes2::Point & pt, const KingdomHeroes & heroes )
     : Interface::ListBox<HeroRow>( pt )
 {
     const fheroes2::Sprite & back = fheroes2::AGG::GetICN( ICN::OVERVIEW, 13 );

diff --git a/src/fheroes2/kingdom/view_world.cpp b/src/fheroes2/kingdom/view_world.cpp
@@ -528,7 +528,7 @@ void ViewWorld::ViewWorldWindow( const int color, const ViewWorldMode mode, Inte
         }
         else if ( le.MousePressLeft( visibleScreenInPixels ) ) {
             if ( isDrag ) {
-                const fheroes2::Point newMousePos = le.GetMouseCursor();
+                const fheroes2::Point & newMousePos = le.GetMouseCursor();
                 const fheroes2::Point
                     newRoiCenter( initRoiCenter.x - ( newMousePos.x - initMousePos.x ) * TILEWIDTH / tileSizePerZoomLevel[static_cast<int>( currentROI._zoomLevel )],
                                   initRoiCenter.y - ( newMousePos.y - initMousePos.y ) * TILEWIDTH / tileSizePerZoomLevel[static_cast<int>( currentROI._zoomLevel )] );

diff --git a/src/fheroes2/monster/monster.cpp b/src/fheroes2/monster/monster.cpp
@@ -20,7 +20,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <math.h>
+#include <cmath>
 
 #include "castle.h"
 #include "difficulty.h"

diff --git a/src/fheroes2/system/settings.h b/src/fheroes2/system/settings.h
@@ -115,9 +115,7 @@ class Settings
         // UNUSED = 0x40008000,
         BATTLE_SOFT_WAITING = 0x40010000,
         BATTLE_REVERSE_WAIT_ORDER = 0x40020000,
-        BATTLE_SKIP_INCREASE_DEFENSE = 0x40200000,
-
-        SETTINGS_LAST
+        BATTLE_SKIP_INCREASE_DEFENSE = 0x40200000
     };
 
     Settings( const Settings & ) = delete;

diff --git a/src/tools/bin2txt.cpp b/src/tools/bin2txt.cpp
@@ -55,9 +55,9 @@ int main( int argc, char ** argv )
         for ( size_t frameId = 0; frameId < 16; ++frameId ) {
             const int frameValue = static_cast<int>( data[5 + setId * 16 + frameId] );
             if ( frameValue < 10 )
-                file << " " << static_cast<int>( frameValue ) << " ";
+                file << " " << frameValue << " ";
             else
-                file << static_cast<int>( frameValue ) << " ";
+                file << frameValue << " ";
         }
         file << "\n";
     }