From b49de1de6017053437574315e7f802d4cabd34a1 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sun, 16 Aug 2020 11:03:42 +0000 Subject: [PATCH] Removes the noexcept keywords and fixes the jenkins build that's in here https://jenkins.maeyanie.com/job/JA2%20Build/ (by Asdow) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8888 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface Map.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index 77ee74ca5..1e5e7c6e6 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -711,7 +711,7 @@ void HandleShowingOfEnemiesWithMilitiaOn( void ) } -INT32 GetMapColourForWeather(const INT16 sX, const INT16 sY) noexcept +INT32 GetMapColourForWeather(const INT16 sX, const INT16 sY) { const INT32 weatherColors[]{ MAP_SHADE_BLACK, @@ -729,7 +729,7 @@ INT32 GetMapColourForWeather(const INT16 sX, const INT16 sY) noexcept } -void FillMapColoursForWeather(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) noexcept +void FillMapColoursForWeather(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) { for (UINT8 sY = 0; sY < MAXIMUM_VALID_Y_COORDINATE; ++sY) { @@ -744,7 +744,7 @@ void FillMapColoursForWeather(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MA } -void FillMapColoursForIntel(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) noexcept +void FillMapColoursForIntel(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) { for (UINT8 sY = 0; sY < MAXIMUM_VALID_Y_COORDINATE; ++sY) { @@ -760,7 +760,7 @@ void FillMapColoursForIntel(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXI } -INT32 GetMapColourForDisease(const INT16 sX, const INT16 sY) noexcept +INT32 GetMapColourForDisease(const INT16 sX, const INT16 sY) { const UINT8 sector = SECTOR(sX, sY); const SECTORINFO *const pSectorInfo = &(SectorInfo[sector]); @@ -794,7 +794,7 @@ INT32 GetMapColourForDisease(const INT16 sX, const INT16 sY) noexcept } -void FillMapColoursForDisease(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) noexcept +void FillMapColoursForDisease(INT32(&colorMap)[ MAXIMUM_VALID_Y_COORDINATE ][ MAXIMUM_VALID_X_COORDINATE ]) { for (UINT8 sY = 0; sY < MAXIMUM_VALID_Y_COORDINATE; ++sY) {