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

GetIdOfMineForSector: use correct min/max values for bSectorZ.

Browse Source 
Minor code improvements.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-01-24 20:35:14 +00:00
parent 0048e75c80
commit 17fee15f2b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Mines.cpp
+7 -9
View File
@@ -529,7 +529,7 @@ INT32 GetAvailableWorkForceForMineForPlayer( INT8 bMineIndex )
*/ */
// Flugente: if strategic disease is active, disease can affect out workforce, so the calculation gets slightly more complicated // Flugente: if strategic disease is active, disease can affect out workforce, so the calculation gets slightly more complicated
iWorkForceSize *= GetWorkforceEffectivenessWithDisease( bTownId, OUR_TEAM ); iWorkForceSize = (INT32)(iWorkForceSize * GetWorkforceEffectivenessWithDisease(bTownId, OUR_TEAM));
// now adjust for town size.. the number of sectors you control // now adjust for town size.. the number of sectors you control
iWorkForceSize *= GetTownSectorsUnderControl( bTownId ); iWorkForceSize *= GetTownSectorsUnderControl( bTownId );
@@ -816,7 +816,7 @@ INT8 GetMineIndexForSector( INT16 sX, INT16 sY )
void GetMineSector( UINT8 ubMineIndex, INT16 * psX, INT16 * psY ) void GetMineSector( UINT8 ubMineIndex, INT16 * psX, INT16 * psY )
{ {
Assert( ( ubMineIndex >= 0 ) && ( ubMineIndex < MAX_NUMBER_OF_MINES ) ); Assert(ubMineIndex < MAX_NUMBER_OF_MINES);
//*psX = gMineLocation[ ubMineIndex ].sSectorX; //*psX = gMineLocation[ ubMineIndex ].sSectorX;
//*psY = gMineLocation[ ubMineIndex ].sSectorY; //*psY = gMineLocation[ ubMineIndex ].sSectorY;
@@ -1303,22 +1303,21 @@ BOOLEAN HasHisMineBeenProducingForPlayerForSomeTime( UINT8 ubMinerProfileId )
return( FALSE ); return( FALSE );
} }
// gte the id of the mine for this sector x,y,z...-1 is invalid // get the id of the mine for this sector x,y,z...-1 is invalid
INT8 GetIdOfMineForSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ ) INT8 GetIdOfMineForSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ )
{ {
INT8 bMineIndex = -1; INT8 bMineIndex = -1;
INT16 sSectorValue; //INT16 sSectorValue;
// are we even on the right level? // are we even on the right level?
if( ( bSectorZ < 0 ) && ( bSectorZ > 2 ) ) if (bSectorZ < MINIMUM_VALID_Z_COORDINATE || bSectorZ > MAXIMUM_VALID_Z_COORDINATE)
{ {
// nope // nope
return( -1 ); return( -1 );
} }
// now get the sectorvalue // now get the sectorvalue
sSectorValue = SECTOR( sSectorX, sSectorY ); //sSectorValue = SECTOR( sSectorX, sSectorY );
// support surface // support surface
if( bSectorZ == 0 ) if( bSectorZ == 0 )
@@ -1423,8 +1422,7 @@ BOOLEAN AreThereMinersInsideThisMine( UINT8 ubMineIndex )
{ {
MINE_STATUS_TYPE *pMineStatus; MINE_STATUS_TYPE *pMineStatus;
Assert(ubMineIndex < MAX_NUMBER_OF_MINES);
Assert( ( ubMineIndex >= 0 ) && ( ubMineIndex < MAX_NUMBER_OF_MINES ) );
pMineStatus = &(gMineStatus[ ubMineIndex ]); pMineStatus = &(gMineStatus[ ubMineIndex ]);