1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removes the noexcept keywords and fixes the jenkins build that's in here https://jenkins.maeyanie.com/job/JA2%20Build/ (by Asdow)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-08-16 11:03:42 +00:00
parent 95a4bde357
commit b49de1de60
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.cpp
+5 -5
View File
@@ -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[]{ const INT32 weatherColors[]{
MAP_SHADE_BLACK, 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) 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) 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 UINT8 sector = SECTOR(sX, sY);
const SECTORINFO *const pSectorInfo = &(SectorInfo[sector]); 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) for (UINT8 sY = 0; sY < MAXIMUM_VALID_Y_COORDINATE; ++sY)
{ {