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

Changed MOVEITEM dropoff gridno to a location that is always guaranteed to exist and be accessible

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-08-20 20:15:16 +00:00
parent 643612540d
commit ec07946730
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+8 -5
View File
@@ -5886,7 +5886,11 @@ void HandleEquipmentMove( INT16 sMapX, INT16 sMapY, INT8 bZ )
// we loop over all mercs with this assignment in this sector, and then do a separate loop over each target sector // we loop over all mercs with this assignment in this sector, and then do a separate loop over each target sector
std::map<UINT8, UINT8> sectormercmap; // this map uses the sectors we take stuff from as keys and the number of mercs as elements std::map<UINT8, UINT8> sectormercmap; // this map uses the sectors we take stuff from as keys and the number of mercs as elements
// count any interrogators found here, and sum up their interrogation values // we need a gridno to which we drop stuff
INT32 sDropOffGridNo = gMapInformation.sCenterGridNo;
if ( !GridNoOnVisibleWorldTile( sDropOffGridNo ) )
sDropOffGridNo = RandomGridNo();
SOLDIERTYPE *pSoldier = NULL; SOLDIERTYPE *pSoldier = NULL;
UINT32 uiCnt = 0; UINT32 uiCnt = 0;
UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID; UINT32 firstid = gTacticalStatus.Team[ OUR_TEAM ].bFirstID;
@@ -5904,6 +5908,9 @@ void HandleEquipmentMove( INT16 sMapX, INT16 sMapY, INT8 bZ )
sectormercmap[targetsector]++; sectormercmap[targetsector]++;
else else
sectormercmap[targetsector] = 1; sectormercmap[targetsector] = 1;
if ( pSoldier->sGridNo != NOWHERE )
sDropOffGridNo = pSoldier->sGridNo;
} }
} }
} }
@@ -5915,10 +5922,6 @@ void HandleEquipmentMove( INT16 sMapX, INT16 sMapY, INT8 bZ )
CHAR16 wSectorName[ 64 ]; CHAR16 wSectorName[ 64 ];
GetShortSectorString( sMapX, sMapY, wSectorName ); GetShortSectorString( sMapX, sMapY, wSectorName );
INT32 sDropOffGridNo = gMapInformation.sCenterGridNo;
if ( !GridNoOnVisibleWorldTile( sDropOffGridNo ) )
sDropOffGridNo = RandomGridNo();
WORLDITEM* pWorldItem_Target = NULL; WORLDITEM* pWorldItem_Target = NULL;
// now loop over all sectors from which we take stuff, and move the equipment // now loop over all sectors from which we take stuff, and move the equipment