Merge branch 'master' of https://github.com/ihhub/fheroes2 into diffe…

…rentiate-save-files-based-on-game-type

.gitignore

@@ -59,3 +59,9 @@
 
 # build directory
 build
+
+# fheroes2 related files
+fheroes2.cfg
+
+# demo directory
+script/demo/demo

VisualStudio/SDL2.props

@@ -6,10 +6,11 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>..\sdl2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WITH_TTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>..\sdl2\lib/$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /Y "$(ProjectDir)..\sdl2\lib\$(PlatformTarget)\*.dll" "$(OutDir)"

appveyor.yml

@@ -46,7 +46,7 @@ install:
 
 after_build:
   - cmd: cd C:\projects\fheroes2\build\%platform%\%configuration%
-  - cmd: 7z a fheroes2_windows_%platform%_%deploy_conf_name%.zip fheroes2.exe SDL*.dll lib*.dll
+  - cmd: 7z a fheroes2_windows_%platform%_%deploy_conf_name%.zip fheroes2.exe SDL*.dll lib*.dll zlib*.dll
   - cmd: cd C:\projects\fheroes2
   - cmd: xcopy /Y /s /Q "doc\README.txt" "."
   - cmd: 7z a build\%platform%\%configuration%\fheroes2_windows_%platform%_%deploy_conf_name%.zip script\demo\demo_windows.bat LICENSE fheroes2.key changelog.txt README.txt

script/windows/install_packages.bat

@@ -1,20 +1,23 @@
 @echo off
 
-if not exist "..\..\..\packages"            mkdir "..\..\..\packages"
-if not exist "..\..\..\packages\zlib"       mkdir "..\..\..\packages\zlib"
-if not exist "..\..\..\packages\sdl"        mkdir "..\..\..\packages\sdl"
-if not exist "..\..\..\packages\sdl_mixer"  mkdir "..\..\..\packages\sdl_mixer"
+if not exist "..\..\..\packages"           mkdir "..\..\..\packages"
+if not exist "..\..\..\packages\zlib"      mkdir "..\..\..\packages\zlib"
+if not exist "..\..\..\packages\sdl"       mkdir "..\..\..\packages\sdl"
+if not exist "..\..\..\packages\sdl_mixer" mkdir "..\..\..\packages\sdl_mixer"
+if not exist "..\..\..\packages\sdl_ttf"   mkdir "..\..\..\packages\sdl_ttf"
 
-echo copying packages [1/5]
+echo copying packages [1/6]
 xcopy /Y /s /Q "..\..\VisualStudio\packages\zlib1.2.11.zip"  "..\..\..\packages\zlib"
-echo downloading packages [2/5]
+echo downloading packages [2/6]
 powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.libsdl.org/release/SDL-devel-1.2.15-VC.zip', '..\..\..\packages\sdl\sdl.zip')"
-echo downloading packages [3/5]
+echo downloading packages [3/6]
 powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-devel-1.2.12-VC.zip', '..\..\..\packages\sdl_mixer\sdl_mixer.zip')"
-echo downloading packages [4/5]
+echo downloading packages [4/6]
 powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip', '..\..\..\packages\sdl\sdl2.zip')"
-echo downloading packages [5/5]
+echo downloading packages [5/6]
 powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.4-VC.zip', '..\..\..\packages\sdl_mixer\sdl_mixer2.zip')"
+echo downloading packages [6/6]
+powershell -Command "(New-Object Net.WebClient).DownloadFile('https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.15-VC.zip', '..\..\..\packages\sdl_ttf\sdl_ttf2.zip')"
 
 xcopy /Y /s /Q "setup_packages.bat" "..\..\..\packages"
 cd "..\..\..\packages"
@@ -31,26 +34,30 @@ if %errorlevel% == 0 (
 )
 
 if not "%sevenZipPath%" == "" (
-    echo unpacking packages [1/5]
+    echo unpacking packages [1/6]
     cd zlib
     "%sevenZipPath%" x zlib1.2.11.zip -aoa > nul
 
-    echo unpacking packages [2/5]
+    echo unpacking packages [2/6]
     cd ..\sdl
     "%sevenZipPath%" x sdl.zip -aoa > nul
 
-    echo unpacking packages [3/5]
+    echo unpacking packages [3/6]
     cd ..\sdl_mixer
     "%sevenZipPath%" x sdl_mixer.zip -aoa > nul
 
-    echo unpacking packages [4/5]
+    echo unpacking packages [4/6]
     cd ..\sdl
     "%sevenZipPath%" x sdl2.zip -aoa > nul
 
-    echo unpacking packages [5/5]
+    echo unpacking packages [5/6]
     cd ..\sdl_mixer
     "%sevenZipPath%" x sdl_mixer2.zip -aoa > nul
 
+    echo unpacking packages [6/6]
+    cd ..\sdl_ttf
+    "%sevenZipPath%" x sdl_ttf2.zip -aoa > nul
+
     cd ..
     call "setup_packages.bat"
     echo "SUCCESS! Installation is completed"

script/windows/setup_packages.bat

@@ -17,29 +17,39 @@ xcopy /Y /s /Q "sdl\SDL-1.2.15\lib"      "..\sdl\lib"
 xcopy /Y /s /Q "sdl\SDL2-2.0.12\include" "..\sdl2\include"
 xcopy /Y /s /Q "sdl\SDL2-2.0.12\lib"     "..\sdl2\lib"
 
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\include"                "..\sdl\include"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\SDL_mixer.dll"  "..\sdl\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\SDL_mixer.lib"  "..\sdl\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\libogg-0.dll" "..\sdl\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\libvorbis-0.dll" "..\sdl\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\include"                     "..\sdl\include"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\SDL_mixer.dll"       "..\sdl\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\SDL_mixer.lib"       "..\sdl\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\libogg-0.dll"        "..\sdl\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\libvorbis-0.dll"     "..\sdl\lib\x86"
 xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x86\libvorbisfile-3.dll" "..\sdl\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\SDL_mixer.dll"  "..\sdl\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\SDL_mixer.lib"  "..\sdl\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\libogg-0.dll" "..\sdl\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\libvorbis-0.dll" "..\sdl\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\SDL_mixer.dll"       "..\sdl\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\SDL_mixer.lib"       "..\sdl\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\libogg-0.dll"        "..\sdl\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\libvorbis-0.dll"     "..\sdl\lib\x64"
 xcopy /Y /s /Q "sdl_mixer\SDL_mixer-1.2.12\lib\x64\libvorbisfile-3.dll" "..\sdl\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\include"                "..\sdl2\include"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\SDL2_mixer.dll" "..\sdl2\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\SDL2_mixer.lib" "..\sdl2\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\libogg-0.dll" "..\sdl2\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\libvorbis-0.dll" "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\include"                     "..\sdl2\include"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\SDL2_mixer.dll"      "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\SDL2_mixer.lib"      "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\libogg-0.dll"        "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\libvorbis-0.dll"     "..\sdl2\lib\x86"
 xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x86\libvorbisfile-3.dll" "..\sdl2\lib\x86"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\SDL2_mixer.dll" "..\sdl2\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\SDL2_mixer.lib" "..\sdl2\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\libogg-0.dll" "..\sdl2\lib\x64"
-xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\libvorbis-0.dll" "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\SDL2_mixer.dll"      "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\SDL2_mixer.lib"      "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\libogg-0.dll"        "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\libvorbis-0.dll"     "..\sdl2\lib\x64"
 xcopy /Y /s /Q "sdl_mixer\SDL2_mixer-2.0.4\lib\x64\libvorbisfile-3.dll" "..\sdl2\lib\x64"
 
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\include"                   "..\sdl2\include"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x86\libfreetype-6.dll" "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x86\SDL2_ttf.dll"      "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x86\zlib1.dll"         "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x86\SDL2_ttf.lib"      "..\sdl2\lib\x86"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x64\libfreetype-6.dll" "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x64\SDL2_ttf.dll"      "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x64\zlib1.dll"         "..\sdl2\lib\x64"
+xcopy /Y /s /Q "sdl_ttf\SDL2_ttf-2.0.15\lib\x64\SDL2_ttf.lib"      "..\sdl2\lib\x64"
+
 xcopy /Y /s /Q "zlib\include" "..\zlib\include"
 xcopy /Y /s /Q "zlib\lib\x86" "..\zlib\lib\x86"
 xcopy /Y /s /Q "zlib\lib\x64" "..\zlib\lib\x64"

src/Makefile

@@ -105,7 +105,7 @@ endif
 
 include Makefile.$(PLATFORM)
 
-export CXX AR LINK WINDRES LDFLAGS CFLAGS LIBS PLATFORM
+export CC CXX AR LINK WINDRES LDFLAGS CFLAGS LIBS PLATFORM
 
 .PHONY: clean
 

src/engine/audio_mixer.cpp

@@ -158,7 +158,7 @@ u16 Mixer::MaxVolume( void )
     return MIX_MAX_VOLUME;
 }
 
-u16 Mixer::Volume( int channel, s16 vol )
+u16 Mixer::Volume( int channel, int16_t vol )
 {
     if ( !valid )
         return 0;
@@ -230,8 +230,8 @@ struct chunk_t
     const u8 * data;
     u32 length;
     u32 position;
-    s16 volume1;
-    s16 volume2;
+    int16_t volume1;
+    int16_t volume2;
     u8 state;
 };
 
@@ -330,7 +330,7 @@ u16 Mixer::MaxVolume( void )
     return SDL_MIX_MAXVOLUME;
 }
 
-u16 Mixer::Volume( int ch, s16 vol )
+u16 Mixer::Volume( int ch, int16_t vol )
 {
     if ( !valid )
         return 0;

src/engine/audio_mixer.h

@@ -47,7 +47,7 @@ namespace Mixer
 
     void SetChannels( u8 );
     u16 MaxVolume( void );
-    u16 Volume( int ch, s16 = -1 );
+    u16 Volume( int ch, int16_t = -1 );
 
     void Pause( int ch = -1 );
     void Resume( int ch = -1 );

src/engine/audio_music.cpp

@@ -91,7 +91,7 @@ void Music::SetFadeOut( int f )
     fadeout = f;
 }
 
-u16 Music::Volume( s16 vol )
+u16 Music::Volume( int16_t vol )
 {
     return Mixer::isValid() ? ( Mix_VolumeMusic( vol > MIX_MAX_VOLUME ? MIX_MAX_VOLUME : vol ) ) : 0;
 }
@@ -302,7 +302,7 @@ void Music::SetFadeIn( int f ) {}
 
 void Music::SetFadeOut( int f ) {}
 
-u16 Music::Volume( s16 vol )
+u16 Music::Volume( int16_t vol )
 {
     return 0;
 }

src/engine/audio_music.h

@@ -32,7 +32,7 @@ namespace Music
 {
     void Play( const std::vector<u8> &, bool loop );
     void Play( const std::string &, bool loop );
-    u16 Volume( s16 vol );
+    u16 Volume( int16_t vol );
     void SetFadeIn( int );
     void SetFadeOut( int );
     void SetExtCommand( const std::string & );

src/engine/font.h

@@ -30,11 +30,11 @@
 #include "surface.h"
 #include "types.h"
 
-class RGBA;
-
 #ifdef WITH_TTF
 #include <SDL_ttf.h>
 
+class RGBA;
+
 class FontTTF
 {
 public:

src/engine/localevent.cpp

@@ -101,13 +101,13 @@ void LocalEvent::SetTapDelayForRightClickEmulation( u32 d )
     clock_delay = d < 200 ? TAP_DELAY_EMULATE : d;
 }
 
-void LocalEvent::SetMouseOffsetX( s16 x )
+void LocalEvent::SetMouseOffsetX( int16_t x )
 {
     SetModes( MOUSE_OFFSET );
     mouse_st.x = x;
 }
 
-void LocalEvent::SetMouseOffsetY( s16 y )
+void LocalEvent::SetMouseOffsetY( int16_t y )
 {
     SetModes( MOUSE_OFFSET );
     mouse_st.y = y;

src/engine/localevent.h

@@ -174,8 +174,8 @@ class LocalEvent
     void SetGlobalFilter( bool );
     void SetTapMode( bool );
     void SetTapDelayForRightClickEmulation( u32 );
-    void SetMouseOffsetX( s16 );
-    void SetMouseOffsetY( s16 );
+    void SetMouseOffsetX( int16_t );
+    void SetMouseOffsetY( int16_t );
 
     static void SetStateDefaults( void );
     static void SetState( u32 type, bool enable );

src/engine/rect.cpp

@@ -33,7 +33,7 @@ Point::Point()
     , y( 0 )
 {}
 
-Point::Point( s16 px, s16 py )
+Point::Point( int16_t px, int16_t py )
     : x( px )
     , y( py )
 {}
@@ -152,7 +152,7 @@ Size Size::operator-( const Size & sz ) const
 
 Rect::Rect() {}
 
-Rect::Rect( s16 rx, s16 ry, u16 rw, u16 rh )
+Rect::Rect( int16_t rx, int16_t ry, u16 rw, u16 rh )
     : Point( rx, ry )
     , Size( rw, rh )
 {}

src/engine/rect.h

@@ -32,10 +32,10 @@
 
 struct Point
 {
-    s16 x, y;
+    int16_t x, y;
 
     Point();
-    Point( s16, s16 );
+    Point( int16_t, int16_t );
 
     bool operator==( const Point & ) const;
     bool operator!=( const Point & ) const;
@@ -73,7 +73,7 @@ struct Size
 struct Rect : Point, Size
 {
     Rect();
-    Rect( s16, s16, u16, u16 );
+    Rect( int16_t, int16_t, u16, u16 );
     Rect( const Point &, u16, u16 );
     Rect( const Point &, const Size & );