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

Fix: If troops spawn at the very northern edge of a sector, we often barely see them, and cannot target their head or torso. To stop that from happening, do not spawn there.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-03-11 19:03:10 +00:00
parent c2b3d1a5a0
commit a6b8b559f0
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Map Edgepoints.cpp
+15 -10
View File
@@ -1236,15 +1236,21 @@ void ChooseMapEdgepoints( MAPEDGEPOINTINFO *pMapEdgepointInfo, UINT8 ubStrategic
psTempArray = (INT32 *) MemAlloc( sizeof(INT32) * usArraySize ); psTempArray = (INT32 *) MemAlloc( sizeof(INT32) * usArraySize );
memcpy(psTempArray, psArray, sizeof(INT32) * usArraySize ); memcpy(psTempArray, psArray, sizeof(INT32) * usArraySize );
psArray = psTempArray; psArray = psTempArray;
for (i = 0; i < usArraySize; i++) for (i = 0; i < usArraySize; ++i)
{ {
if (TERRAIN_IS_HIGH_WATER( GetTerrainType(psArray[ i ]) ) ) // Flugente: if troops spawn at the very northern edge of a sector, we often barely see them, and cannot target their head or torso.
// To stop that from happening, also remove these spawning points
INT32 nextgridno = NewGridNo( psArray[i], DirectionInc( NORTHWEST ) );
if ( TERRAIN_IS_HIGH_WATER( GetTerrainType(psArray[ i ]) ) ||
gubWorldMovementCosts[(psArray[i] + DirectionInc( NORTHWEST ))][NORTHWEST][0] == TRAVELCOST_OFF_MAP ||
gubWorldMovementCosts[(nextgridno + DirectionInc( NORTHWEST ))][NORTHWEST][0] == TRAVELCOST_OFF_MAP )
{ {
if (i == usArraySize - 1) if (i == usArraySize - 1)
{ {
// just axe it and we're done. // just axe it and we're done.
psArray[ i ] = 0; psArray[ i ] = 0;
usArraySize--; --usArraySize;
break; break;
} }
else else
@@ -1252,9 +1258,9 @@ void ChooseMapEdgepoints( MAPEDGEPOINTINFO *pMapEdgepointInfo, UINT8 ubStrategic
// replace this element in the array with the LAST element in the array, then decrement // replace this element in the array with the LAST element in the array, then decrement
// the array size // the array size
psArray[ i ] = psArray[usArraySize-1]; psArray[ i ] = psArray[usArraySize-1];
usArraySize--; --usArraySize;
// we're going to have to check the array element we just copied into this spot, too // we're going to have to check the array element we just copied into this spot, too
i--; --i;
} }
} }
} }
@@ -1262,7 +1268,7 @@ void ChooseMapEdgepoints( MAPEDGEPOINTINFO *pMapEdgepointInfo, UINT8 ubStrategic
if( ubNumDesiredPoints >= usArraySize ) if( ubNumDesiredPoints >= usArraySize )
{ //We don't have enough points for everyone, return them all. { //We don't have enough points for everyone, return them all.
pMapEdgepointInfo->ubNumPoints = (UINT8)usArraySize; pMapEdgepointInfo->ubNumPoints = (UINT8)usArraySize;
for( i = 0; i < usArraySize; i++ ) for( i = 0; i < usArraySize; ++i )
pMapEdgepointInfo->sGridNo[i] = psArray[i]; pMapEdgepointInfo->sGridNo[i] = psArray[i];
// JA2Gold: free the temp array // JA2Gold: free the temp array
@@ -1273,19 +1279,18 @@ void ChooseMapEdgepoints( MAPEDGEPOINTINFO *pMapEdgepointInfo, UINT8 ubStrategic
usSlots = usArraySize; usSlots = usArraySize;
usCurrSlot = 0; usCurrSlot = 0;
pMapEdgepointInfo->ubNumPoints = ubNumDesiredPoints; pMapEdgepointInfo->ubNumPoints = ubNumDesiredPoints;
for( i = 0; i < usArraySize; i++ ) for( i = 0; i < usArraySize; ++i )
{ {
if( Random( usSlots ) < ubNumDesiredPoints ) if( Random( usSlots ) < ubNumDesiredPoints )
{ {
pMapEdgepointInfo->sGridNo[ usCurrSlot++ ] = psArray[ i ]; pMapEdgepointInfo->sGridNo[ usCurrSlot++ ] = psArray[ i ];
ubNumDesiredPoints--; --ubNumDesiredPoints;
} }
usSlots--; --usSlots;
} }
// JA2Gold: free the temp array // JA2Gold: free the temp array
MemFree(psTempArray); MemFree(psTempArray);
} }