Release 2.15.0

README

@@ -1,7 +1,7 @@
 Seven Kingdoms: Ancient Adversaries
 -----------------------------------
 
-Release version 2.15.0-dev
+Release version 2.15.0
 Project website: www.7kfans.com
 
 This is a GPL release of the Seven Kingdoms: Ancient Adversaries thanks to
@@ -11,32 +11,25 @@ details of the license. We are indebted to Enlight for making the 7kfans
 project possible and giving a new chance to build a community for fans
 of the game.
 
-Summary of changes in this release
+Summary of changes from 2.14.7 to 2.15.0
 ---------
- * Fixed the visibly fake spy loyalty, leading to easy spy detection
- * Increased the rate of fryhtan attacks, based on the number of lairs (MicroVirus)
- * Fixed the greater being mana exploit (sraboy)
- * Implement better penalty levels for killing civilians
- * Fixed a number of AI bugs
- * Fixed bugs and crashes
- * Improved platform compatibility
- * Disabled virtualized window scaling in Windows, which may fix strange mouse behavior
- * Added a login dialog for using 7kfans multiplayer service
- * Added support for NAT punch-through
+ * Enabed multiplayer sync checking by default
+ * Added experimental multiplayer game recording and replay (use 'r' at main
+   menu screen after playing a match)
+ * Enhanced localization support
+ * Enabled translation support on Windows
+ * Properly support system locales including UTF-8 codesets
+ * Added Russian fonts
+ * Added Russian translation
+ * Improved 64-bit platform support
+ * Upgraded to SDL 2.0.8 to work around Windows 10 1709 bug
+ * Improved mouse control and full-screen interaction
+ * Fixed obscure crashing bug with the Caravan interface
+ * Added game manual
 
 Thanks to all who made this release possible.
 
 
-What is missing from the open source version of the game
----------
-* The original game music. The music is provided by 7kfans, but separately
-  from the source tree. It is not under the GPL license, but it is free to
-  download and use with 7KAA.
-* The original game intro video. Support may be restored in future releases.
-* Any other content from original game CDs, game manual, including the version
-  2.12b game binary or older. This also includes the I*Magic Online service.
-
-
 System Requirements
 ---------
 
@@ -56,20 +49,20 @@ Building the game
 ---------
 
 Required dependencies
-* GCC 4.6+ or later (or other C++11 compliant compiler)
-* SDL 2.0.2 or later (http://libsdl.org/)
+* GCC 4.6+ (C++11 compliant compiler)
+* SDL 2.0.8 (http://libsdl.org/)
 * enet 1.3.xx (http://enet.bespin.org/)
 * OpenAL-soft or equivalent driver (http://kcat.strangesoft.net/openal.html)
 
 Optional dependencies
 * Autoconf 2.65 (when using git snapshot)
-* libcurl the URL transfer library, for full 7kfans multiplayer integration
-* gettext 0.18 or later
-* Game music bundle (copy music into data folder or PACKAGE_DATA_PATH)
+* libcurl for full 7kfans multiplayer integration
+* gettext 0.19
+* Game music bundle (copy music into program data folder or PACKAGE_DATA_PATH)
 * NSIS for building a Windows installer
 
 
-Running
+Running locally from source build
 --------
 
 To run the game from the build directory, you need to point to the game data

configure.ac

@@ -80,7 +80,6 @@ AC_CHECK_FUNCS([_NSGetExecutablePath])
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.19])
-AM_ICONV
 
 # Configuration variables
 
@@ -178,6 +177,34 @@ AS_IF([test "$enable_asm" = yes], [
 
 # Library dependencies
 
+AS_IF([test "$USE_NLS" = "yes"], [
+  found_gettext=no
+  found_iconv=no
+  AC_CHECK_FUNC([gettext], [found_gettext=builtin])
+  AS_IF([test "$found_gettext" = no], [
+    AC_CHECK_LIB([intl], [gettext], [
+      found_gettext=libintl
+    ])
+  ])
+  AS_IF([test "$found_gettext" = no], [
+    AC_MSG_ERROR([gettext is required for NLS])
+  ])
+  AC_CHECK_FUNC([iconv], [found_iconv=builtin])
+  AS_IF([test "$found_iconv" = no], [
+    AC_CHECK_LIB([iconv], [iconv], [
+      found_iconv=libiconv
+    ])
+  ])
+  AS_IF([test "$found_iconv" = no], [
+    AC_CHECK_LIB([iconv], [libiconv], [
+      found_iconv=libiconv
+    ])
+  ])
+  AS_IF([test "$found_iconv" = no], [
+    AC_MSG_ERROR([iconv is required for NLS])
+  ])
+])
+
 AS_IF([test "$audio_backend" = openal], [
   PKG_CHECK_MODULES([OPENAL], [openal], [
     AC_DEFINE_UNQUOTED([OPENAL_AL_H], [<AL/al.h>],
@@ -198,6 +225,7 @@ AM_PATH_SDL2([2.0.4], [], [
   AC_ERROR([SDL not found])
 ])
 CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+dnl FIXME: SDLmain can screw up some autoconf macros
 LIBS="$SDL_LIBS $LIBS"
 
 AS_IF([test "$enable_enet" = yes], [
@@ -238,8 +266,14 @@ AS_IF([test "$use_mingw" = yes], [
     LIBS="$LIBS -static-libstdc++ -static-libgcc -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive"
   ])
 ])
+
 dnl Note if mingw static is on, this is statically linked too
-LIBS="$LIBS $LIBINTL $LIBICONV"
+AS_IF([test "$found_gettext" = libintl], [
+  LIBS="$LIBS -lintl"
+])
+AS_IF([test "$found_iconv" = libiconv], [
+  LIBS="$LIBS -liconv"
+])
 
 
 # Defines

include/version.h

@@ -32,6 +32,6 @@
 #define SKVERMED 15
 #define SKVERMIN 0
 
-#define DEV_VERSION
+//#define DEV_VERSION
 
 #endif

packaging/windows/install.nsi

@@ -201,6 +201,7 @@ Section "Uninstall"
   RMDir /r "$INSTDIR\encyc"
   RMDir /r "$INSTDIR\encyc2"
   RMDir /r "$INSTDIR\image"
+  RMDir /r "$INSTDIR\locale"
   RMDir /r "$INSTDIR\resource"
   RMDir /r "$INSTDIR\scenari2"
   RMDir /r "$INSTDIR\scenario"

src/Makefile.am

@@ -287,7 +287,7 @@ bin_PROGRAMS = 7kaa
 	vgautil.cpp \
 	vgautil2.cpp
 
-7kaa_CPPFLAGS = \
+AM_CPPFLAGS = \
 	-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
 	-DLOCALE_DIR=\"$(localedir)\"