diff --git a/GameVersion.cpp b/GameVersion.cpp index 34d2b679..ae55ed03 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -15,9 +15,9 @@ #ifdef JA2EDITOR #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8317 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8317 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8317 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8317 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8317 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,16 @@ //RELEASE BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8317 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8317 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8297 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.8317 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 16.09.12" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 16.10.15" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index c2848271..cc56eacd 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -5344,7 +5344,7 @@ FLOAT GetSAMMaxDistanceToCoveredSector( UINT8 usSam ) { if ( ubSAMControlledSectors[y][x] & (1 << usSam) ) { - FLOAT dist = std::sqrt( (sam_x - x)*(sam_x - x) + (sam_y - y)*(sam_y - y) ); + FLOAT dist = std::sqrt( FLOAT((sam_x - x)*(sam_x - x) + (sam_y - y)*(sam_y - y)) ); if ( maxdist < dist ) maxdist = dist; @@ -5375,7 +5375,7 @@ BOOLEAN DoesSamCoverSector( UINT8 usSam, UINT8 usSector, BOOLEAN* apSamIsWorking *apSamIsWorking = TRUE; } - FLOAT dist = std::sqrt( (SECTORX( samsector ) - SECTORX( usSector ))*(SECTORX( samsector ) - SECTORX( usSector )) + (SECTORY( samsector ) - SECTORY( usSector ))*(SECTORY( samsector ) - SECTORY( usSector )) ); + FLOAT dist = std::sqrt( FLOAT((SECTORX( samsector ) - SECTORX( usSector ))*(SECTORX( samsector ) - SECTORX( usSector )) + (SECTORY( samsector ) - SECTORY( usSector ))*(SECTORY( samsector ) - SECTORY( usSector ))) ); // determine max distance SAM has to cover FLOAT sammaxdistance = GetSAMMaxDistanceToCoveredSector( usSam ); diff --git a/Tactical/Handle Items.h b/Tactical/Handle Items.h index 1c281818..8a45e3b3 100644 --- a/Tactical/Handle Items.h +++ b/Tactical/Handle Items.h @@ -79,6 +79,10 @@ typedef struct } ITEM_POOL_LOCATOR; +// silversurfer: added this to prevent tons of compiler warnings in VS2010 because of new behaviour for array initialization used in below structs +// see https://msdn.microsoft.com/en-us/library/1ywe7hcy.aspx +#pragma warning( disable : 4351 ) + // Flugente: we can construct and deconstruct map structures via items. typedef struct STRUCTURE_DECONSTRUCT { STRUCTURE_DECONSTRUCT()