From 8b10f70afd02e49bde073d7e66bd7f1225c5d66c Mon Sep 17 00:00:00 2001 From: DjWarmonger Date: Sun, 31 Aug 2014 19:08:39 +0200 Subject: [PATCH] Migrating to MSVS 2013, which allows to delete inttypes.h file. --- AI/BattleAI/BattleAI.vcxproj | 10 +- AI/EmptyAI/EmptyAI.vcxproj | 10 +- AI/FuzzyLite/FuzzyLite.vcxproj | 10 +- AI/StupidAI/StupidAI.vcxproj | 10 +- AI/VCAI/VCAI.vcxproj | 10 +- client/VCMI_client.vcxproj | 10 +- client/inttypes.h | 305 --------------------------------- editor/Editor.vcxproj | 6 +- launcher/VCMI_launcher.vcxproj | 6 +- lib/VCMI_lib.vcxproj | 10 +- lib/minizip/minizip.vcxproj | 10 +- lib/rmg/CMapGenerator.cpp | 4 + scripting/erm/ERM.vcxproj | 10 +- server/VCMI_server.vcxproj | 10 +- test/Test.vcxproj | 10 +- 15 files changed, 65 insertions(+), 366 deletions(-) delete mode 100644 client/inttypes.h diff --git a/AI/BattleAI/BattleAI.vcxproj b/AI/BattleAI/BattleAI.vcxproj index 733315771..5ebeec7cb 100644 --- a/AI/BattleAI/BattleAI.vcxproj +++ b/AI/BattleAI/BattleAI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp diff --git a/AI/EmptyAI/EmptyAI.vcxproj b/AI/EmptyAI/EmptyAI.vcxproj index 90041b5cd..0172e8295 100644 --- a/AI/EmptyAI/EmptyAI.vcxproj +++ b/AI/EmptyAI/EmptyAI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -41,27 +41,27 @@ DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp diff --git a/AI/FuzzyLite/FuzzyLite.vcxproj b/AI/FuzzyLite/FuzzyLite.vcxproj index 29ff22036..c0d840b66 100644 --- a/AI/FuzzyLite/FuzzyLite.vcxproj +++ b/AI/FuzzyLite/FuzzyLite.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -67,27 +67,27 @@ StaticLibrary true MultiByte - v110 + v120_xp StaticLibrary true MultiByte - v110 + v120_xp StaticLibrary false true MultiByte - v110_xp + v120_xp StaticLibrary false true MultiByte - v110_xp + v120_xp diff --git a/AI/StupidAI/StupidAI.vcxproj b/AI/StupidAI/StupidAI.vcxproj index 73b4d7658..f459b611e 100644 --- a/AI/StupidAI/StupidAI.vcxproj +++ b/AI/StupidAI/StupidAI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp diff --git a/AI/VCAI/VCAI.vcxproj b/AI/VCAI/VCAI.vcxproj index fc300809e..2fe4459be 100644 --- a/AI/VCAI/VCAI.vcxproj +++ b/AI/VCAI/VCAI.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary true MultiByte - v110 + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp DynamicLibrary false true MultiByte - v110_xp + v120_xp diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj index 4da5b5eaa..4ad6160b0 100644 --- a/client/VCMI_client.vcxproj +++ b/client/VCMI_client.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,23 +27,23 @@ Application Unicode true - v110_xp + v120_xp Application Unicode true - v110_xp + v120_xp Application Unicode - v110 + v120_xp Application Unicode - v110 + v120_xp diff --git a/client/inttypes.h b/client/inttypes.h deleted file mode 100644 index 4b3828a21..000000000 --- a/client/inttypes.h +++ /dev/null @@ -1,305 +0,0 @@ -// ISO C9x compliant inttypes.h for Microsoft Visual Studio -// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 -// -// Copyright (c) 2006 Alexander Chemeris -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The name of the author may be used to endorse or promote products -// derived from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _MSC_VER // [ -#error "Use this header only with Microsoft Visual C++ compilers!" -#endif // _MSC_VER ] - -#ifndef _MSC_INTTYPES_H_ // [ -#define _MSC_INTTYPES_H_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#include "stdint.h" - -// 7.8 Format conversion of integer types - -typedef struct { - intmax_t quot; - intmax_t rem; -} imaxdiv_t; - -// 7.8.1 Macros for format specifiers - -#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198 - -// The fprintf macros for signed integers are: -#define PRId8 "d" -#define PRIi8 "i" -#define PRIdLEAST8 "d" -#define PRIiLEAST8 "i" -#define PRIdFAST8 "d" -#define PRIiFAST8 "i" - -#define PRId16 "hd" -#define PRIi16 "hi" -#define PRIdLEAST16 "hd" -#define PRIiLEAST16 "hi" -#define PRIdFAST16 "hd" -#define PRIiFAST16 "hi" - -#define PRId32 "I32d" -#define PRIi32 "I32i" -#define PRIdLEAST32 "I32d" -#define PRIiLEAST32 "I32i" -#define PRIdFAST32 "I32d" -#define PRIiFAST32 "I32i" - -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIdLEAST64 "I64d" -#define PRIiLEAST64 "I64i" -#define PRIdFAST64 "I64d" -#define PRIiFAST64 "I64i" - -#define PRIdMAX "I64d" -#define PRIiMAX "I64i" - -#define PRIdPTR "Id" -#define PRIiPTR "Ii" - -// The fprintf macros for unsigned integers are: -#define PRIo8 "o" -#define PRIu8 "u" -#define PRIx8 "x" -#define PRIX8 "X" -#define PRIoLEAST8 "o" -#define PRIuLEAST8 "u" -#define PRIxLEAST8 "x" -#define PRIXLEAST8 "X" -#define PRIoFAST8 "o" -#define PRIuFAST8 "u" -#define PRIxFAST8 "x" -#define PRIXFAST8 "X" - -#define PRIo16 "ho" -#define PRIu16 "hu" -#define PRIx16 "hx" -#define PRIX16 "hX" -#define PRIoLEAST16 "ho" -#define PRIuLEAST16 "hu" -#define PRIxLEAST16 "hx" -#define PRIXLEAST16 "hX" -#define PRIoFAST16 "ho" -#define PRIuFAST16 "hu" -#define PRIxFAST16 "hx" -#define PRIXFAST16 "hX" - -#define PRIo32 "I32o" -#define PRIu32 "I32u" -#define PRIx32 "I32x" -#define PRIX32 "I32X" -#define PRIoLEAST32 "I32o" -#define PRIuLEAST32 "I32u" -#define PRIxLEAST32 "I32x" -#define PRIXLEAST32 "I32X" -#define PRIoFAST32 "I32o" -#define PRIuFAST32 "I32u" -#define PRIxFAST32 "I32x" -#define PRIXFAST32 "I32X" - -#define PRIo64 "I64o" -#define PRIu64 "I64u" -#define PRIx64 "I64x" -#define PRIX64 "I64X" -#define PRIoLEAST64 "I64o" -#define PRIuLEAST64 "I64u" -#define PRIxLEAST64 "I64x" -#define PRIXLEAST64 "I64X" -#define PRIoFAST64 "I64o" -#define PRIuFAST64 "I64u" -#define PRIxFAST64 "I64x" -#define PRIXFAST64 "I64X" - -#define PRIoMAX "I64o" -#define PRIuMAX "I64u" -#define PRIxMAX "I64x" -#define PRIXMAX "I64X" - -#define PRIoPTR "Io" -#define PRIuPTR "Iu" -#define PRIxPTR "Ix" -#define PRIXPTR "IX" - -// The fscanf macros for signed integers are: -#define SCNd8 "d" -#define SCNi8 "i" -#define SCNdLEAST8 "d" -#define SCNiLEAST8 "i" -#define SCNdFAST8 "d" -#define SCNiFAST8 "i" - -#define SCNd16 "hd" -#define SCNi16 "hi" -#define SCNdLEAST16 "hd" -#define SCNiLEAST16 "hi" -#define SCNdFAST16 "hd" -#define SCNiFAST16 "hi" - -#define SCNd32 "ld" -#define SCNi32 "li" -#define SCNdLEAST32 "ld" -#define SCNiLEAST32 "li" -#define SCNdFAST32 "ld" -#define SCNiFAST32 "li" - -#define SCNd64 "I64d" -#define SCNi64 "I64i" -#define SCNdLEAST64 "I64d" -#define SCNiLEAST64 "I64i" -#define SCNdFAST64 "I64d" -#define SCNiFAST64 "I64i" - -#define SCNdMAX "I64d" -#define SCNiMAX "I64i" - -#ifdef _WIN64 // [ -# define SCNdPTR "I64d" -# define SCNiPTR "I64i" -#else // _WIN64 ][ -# define SCNdPTR "ld" -# define SCNiPTR "li" -#endif // _WIN64 ] - -// The fscanf macros for unsigned integers are: -#define SCNo8 "o" -#define SCNu8 "u" -#define SCNx8 "x" -#define SCNX8 "X" -#define SCNoLEAST8 "o" -#define SCNuLEAST8 "u" -#define SCNxLEAST8 "x" -#define SCNXLEAST8 "X" -#define SCNoFAST8 "o" -#define SCNuFAST8 "u" -#define SCNxFAST8 "x" -#define SCNXFAST8 "X" - -#define SCNo16 "ho" -#define SCNu16 "hu" -#define SCNx16 "hx" -#define SCNX16 "hX" -#define SCNoLEAST16 "ho" -#define SCNuLEAST16 "hu" -#define SCNxLEAST16 "hx" -#define SCNXLEAST16 "hX" -#define SCNoFAST16 "ho" -#define SCNuFAST16 "hu" -#define SCNxFAST16 "hx" -#define SCNXFAST16 "hX" - -#define SCNo32 "lo" -#define SCNu32 "lu" -#define SCNx32 "lx" -#define SCNX32 "lX" -#define SCNoLEAST32 "lo" -#define SCNuLEAST32 "lu" -#define SCNxLEAST32 "lx" -#define SCNXLEAST32 "lX" -#define SCNoFAST32 "lo" -#define SCNuFAST32 "lu" -#define SCNxFAST32 "lx" -#define SCNXFAST32 "lX" - -#define SCNo64 "I64o" -#define SCNu64 "I64u" -#define SCNx64 "I64x" -#define SCNX64 "I64X" -#define SCNoLEAST64 "I64o" -#define SCNuLEAST64 "I64u" -#define SCNxLEAST64 "I64x" -#define SCNXLEAST64 "I64X" -#define SCNoFAST64 "I64o" -#define SCNuFAST64 "I64u" -#define SCNxFAST64 "I64x" -#define SCNXFAST64 "I64X" - -#define SCNoMAX "I64o" -#define SCNuMAX "I64u" -#define SCNxMAX "I64x" -#define SCNXMAX "I64X" - -#ifdef _WIN64 // [ -# define SCNoPTR "I64o" -# define SCNuPTR "I64u" -# define SCNxPTR "I64x" -# define SCNXPTR "I64X" -#else // _WIN64 ][ -# define SCNoPTR "lo" -# define SCNuPTR "lu" -# define SCNxPTR "lx" -# define SCNXPTR "lX" -#endif // _WIN64 ] - -#endif // __STDC_FORMAT_MACROS ] - -// 7.8.2 Functions for greatest-width integer types - -// 7.8.2.1 The imaxabs function -#define imaxabs _abs64 - -// 7.8.2.2 The imaxdiv function - -// This is modified version of div() function from Microsoft's div.c found -// in %MSVC.NET%\crt\src\div.c -#ifdef STATIC_IMAXDIV // [ -static -#else // STATIC_IMAXDIV ][ -_inline -#endif // STATIC_IMAXDIV ] -imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom) -{ - imaxdiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - if (numer < 0 && result.rem > 0) { - // did division wrong; must fix up - ++result.quot; - result.rem -= denom; - } - - return result; -} - -// 7.8.2.3 The strtoimax and strtoumax functions -#define strtoimax _strtoi64 -#define strtoumax _strtoui64 - -// 7.8.2.4 The wcstoimax and wcstoumax functions -#define wcstoimax _wcstoi64 -#define wcstoumax _wcstoui64 - - -#endif // _MSC_INTTYPES_H_ ] diff --git a/editor/Editor.vcxproj b/editor/Editor.vcxproj index 748c13dc7..e99465f10 100644 --- a/editor/Editor.vcxproj +++ b/editor/Editor.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -17,11 +17,11 @@ Application - v110 + v120 Application - v110 + v120 diff --git a/launcher/VCMI_launcher.vcxproj b/launcher/VCMI_launcher.vcxproj index 0ae5e0532..05f1cf36a 100644 --- a/launcher/VCMI_launcher.vcxproj +++ b/launcher/VCMI_launcher.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -19,13 +19,13 @@ Application true - v110 + v120 Unicode Application false - v110 + v120 true Unicode diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj index 5e7da453f..6886e50b4 100644 --- a/lib/VCMI_lib.vcxproj +++ b/lib/VCMI_lib.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,24 +27,24 @@ DynamicLibrary Unicode true - v110_xp + v120_xp DynamicLibrary Unicode true - v110_xp + v120_xp DynamicLibrary Unicode - v110 + v120_xp true DynamicLibrary MultiByte - v110 + v120_xp diff --git a/lib/minizip/minizip.vcxproj b/lib/minizip/minizip.vcxproj index 64b4e25aa..dd5c9bb30 100644 --- a/lib/minizip/minizip.vcxproj +++ b/lib/minizip/minizip.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -37,26 +37,26 @@ DynamicLibrary true - v110 + v120 Unicode DynamicLibrary true - v110 + v120 Unicode DynamicLibrary false - v110 + v120 true Unicode DynamicLibrary false - v110 + v120 true Unicode diff --git a/lib/rmg/CMapGenerator.cpp b/lib/rmg/CMapGenerator.cpp index 5978ff7c2..5065c45da 100644 --- a/lib/rmg/CMapGenerator.cpp +++ b/lib/rmg/CMapGenerator.cpp @@ -81,6 +81,9 @@ std::unique_ptr CMapGenerator::generate(CMapGenOptions * mapGenOptions, in { this->mapGenOptions = mapGenOptions; this->randomSeed = randomSeed; + + assert(mapGenOptions); + rand.setSeed(this->randomSeed); mapGenOptions->finalize(rand); @@ -90,6 +93,7 @@ std::unique_ptr CMapGenerator::generate(CMapGenOptions * mapGenOptions, in try { editManager->getUndoManager().setUndoRedoLimit(0); + //FIXME: somehow mapGenOption is nullptr at this point :? addHeaderInfo(); initTiles(); diff --git a/scripting/erm/ERM.vcxproj b/scripting/erm/ERM.vcxproj index badd52010..b0ca12c15 100644 --- a/scripting/erm/ERM.vcxproj +++ b/scripting/erm/ERM.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,27 +27,27 @@ DynamicLibrary true MultiByte - v110_xp + v120 DynamicLibrary true MultiByte - v110_xp + v120 DynamicLibrary false true MultiByte - v110 + v120 DynamicLibrary false true MultiByte - v110 + v120 diff --git a/server/VCMI_server.vcxproj b/server/VCMI_server.vcxproj index ba2892d7e..5ec5be4dc 100644 --- a/server/VCMI_server.vcxproj +++ b/server/VCMI_server.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,23 +27,23 @@ Application MultiByte true - v110_xp + v120_xp Application MultiByte true - v110_xp + v120_xp Application Unicode - v110 + v120_xp Application Unicode - v110 + v120_xp diff --git a/test/Test.vcxproj b/test/Test.vcxproj index ff9019849..934a81a0d 100644 --- a/test/Test.vcxproj +++ b/test/Test.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,23 +27,23 @@ Application Unicode true - v110_xp + v120_xp Application Unicode true - v110_xp + v120_xp Application Unicode - v110 + v120_xp Application Unicode - v110 + v120_xp