Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8832 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Assignments.cpp

@@ -10751,7 +10751,7 @@ void DetermineWhichAssignmentMenusCanBeShown( void )
 	{
 		if( fShowMapScreenMovementList == TRUE )
 		{
-			if( bSelectedDestChar == -1 )
+			if( GetSelectedDestChar() == -1 )
 			{
 				fCharacterNoLongerValid = TRUE;
 				HandleShowingOfMovementBox( );

Strategic/Map Screen Interface Border.cpp

@@ -990,7 +990,7 @@ void TurnOnAirSpaceMode( void )
 			MapBorderButtonOff( MAP_BORDER_ITEM_BTN );
 		}
 
-		if ( bSelectedDestChar != -1 )
+		if ( GetSelectedDestChar() != -1 )
 		{
 			AbortMovementPlottingMode( );
 		}
@@ -1053,7 +1053,7 @@ void TurnOnItemFilterMode( void )
 			MapBorderButtonOff( MAP_BORDER_MILITIA_BTN );
 		}
 		
-		if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+		if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 		{
 			AbortMovementPlottingMode( );
 		}
@@ -1113,7 +1113,7 @@ void TurnOnDiseaseFilterMode( void )
 			MapBorderButtonOff( MAP_BORDER_MILITIA_BTN );
 		}
 		
-		if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+		if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 		{
 			AbortMovementPlottingMode( );
 		}
@@ -1179,7 +1179,7 @@ void TurnOnWeatherFilterMode()
 			MapBorderButtonOff( MAP_BORDER_MILITIA_BTN );
 		}
 
-		if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+		if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 		{
 			AbortMovementPlottingMode( );
 		}
@@ -1247,7 +1247,7 @@ void TurnOnIntelFilterMode()
 			MapBorderButtonOff( MAP_BORDER_MILITIA_BTN );
 		}
 
-		if ( ( bSelectedDestChar != -1 ) || fPlotForHelicopter || fPlotForMilitia )
+		if ( ( GetSelectedDestChar() != -1 ) || fPlotForHelicopter || fPlotForMilitia )
 		{
 			AbortMovementPlottingMode();
 		}

Strategic/Map Screen Interface Bottom.cpp

@@ -1341,7 +1341,7 @@ BOOLEAN AllowedToTimeCompress( void )
 	}
 
 	// moving / confirming movement
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia || gfInConfirmMapMoveMode || fShowMapScreenMovementList )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia || gfInConfirmMapMoveMode || fShowMapScreenMovementList )
 	{
 		return( FALSE );
 	}
@@ -1682,7 +1682,7 @@ BOOLEAN CommonTimeCompressionChecks( void )
 		return( TRUE );
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		// abort plotting movement
 		AbortMovementPlottingMode( );

Strategic/Map Screen Interface Map.cpp

@@ -478,9 +478,6 @@ UINT32 guiMAPCURSORS;
 // HEADROCK HAM 5: New pathing arrows may replace the above eventually, but for now a separate variable will do.
 UINT32 guiMapPathingArrows;
 
-// destination plotting character
-INT8 bSelectedDestChar = -1;
-
 // assignment selection character
 INT8 bSelectedAssignChar=-1;
 
@@ -604,6 +601,19 @@ void SetUpValidCampaignSectors( void );
 BOOLEAN LoadHiddenTownFromLoadGameFile( HWFILE hFile );
 BOOLEAN SaveHiddenTownToSaveGameFile( HWFILE hFile );
 
+// Flugente: added getter/setter so that we can easily check when a new char is set
+// we also set a marker determining when we should update the squads data, so that we only check that when required
+// destination plotting character
+INT8 bSelectedDestChar = -1;
+bool gSquadEncumbranceCheckNecessary = true;
+
+INT8 GetSelectedDestChar() { return bSelectedDestChar; }
+void SetSelectedDestChar( INT8 aVal )
+{
+	bSelectedDestChar = aVal;
+	gSquadEncumbranceCheckNecessary = true;
+}
+
 //--------------Legion 2----Jazz-----------
 
 void DrawIconL(INT32 MAP_GRID_X2, INT32 MAP_GRID_Y2, INT32 i )
@@ -640,7 +650,7 @@ void DrawMapIndexBigMap( BOOLEAN fSelectedCursorIsYellow )
 
 	for(iCount=1; iCount <= MAX_VIEW_SECTORS; ++iCount)
 	{
-		if ( fDrawCursors && (iCount == sSelMapX) && (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+		if ( fDrawCursors && (iCount == sSelMapX) && ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 			SetFontForeground( ( UINT8 ) ( fSelectedCursorIsYellow ? FONT_YELLOW : FONT_WHITE ) );
 		else if( fDrawCursors && ( iCount == gsHighlightSectorX ) )
 			SetFontForeground(FONT_WHITE);
@@ -650,7 +660,7 @@ void DrawMapIndexBigMap( BOOLEAN fSelectedCursorIsYellow )
 		FindFontCenterCoordinates(((INT16)(MAP_HORT_INDEX_X+( iCount - 1) *MAP_GRID_X)), MAP_HORT_INDEX_Y, MAP_GRID_X, MAP_HORT_HEIGHT, pMapHortIndex[iCount], MAP_FONT, &usX, &usY);
 		mprintf(usX,usY,pMapHortIndex[iCount]);
 
-		if ( fDrawCursors && (iCount == sSelMapY) && (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+		if ( fDrawCursors && (iCount == sSelMapY) && ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 			SetFontForeground( ( UINT8 ) ( fSelectedCursorIsYellow ? FONT_YELLOW : FONT_WHITE ) );
 		else if( fDrawCursors && ( iCount == gsHighlightSectorY ) )
 			SetFontForeground(FONT_WHITE);
@@ -2810,7 +2820,7 @@ BOOLEAN TraceCharAnimatedRoute( PathStPtr pPath, BOOLEAN fCheckFlag, BOOLEAN fFo
 	PathStPtr pNextNode=NULL;
 
 	// must be plotting movement
-	if ( (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+	if ( ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 	{
 		return FALSE;
 	}

Strategic/Map Screen Interface Map.h

@@ -383,7 +383,10 @@ extern BOOLEAN fDrawTempHeliPath;
 extern BOOLEAN fDrawTempMilitiaPath;
 
 // selected destination char
-extern INT8 bSelectedDestChar;
+INT8 GetSelectedDestChar();
+void SetSelectedDestChar( INT8 aVal );
+
+extern bool gSquadEncumbranceCheckNecessary;
 
 // current assignment character
 extern INT8 bSelectedAssignChar;

Strategic/Map Screen Interface.cpp

@@ -1017,7 +1017,7 @@ INT16 CharacterIsGettingPathPlotted( INT16 sCharNumber )
 
 	// if the highlighted line character is also selected
 	if ( ( ( giDestHighLine != -1 ) && IsEntryInSelectedListSet ( ( INT8 ) giDestHighLine + FIRSTmercTOdisplay ) ) ||
-			( ( bSelectedDestChar != -1 ) && IsEntryInSelectedListSet ( bSelectedDestChar ) ) )
+			( ( GetSelectedDestChar() != -1 ) && IsEntryInSelectedListSet ( GetSelectedDestChar() ) ) )
 	{
 		// then ALL selected lines will be affected
 		if( IsEntryInSelectedListSet( ( INT8 ) sCharNumber + FIRSTmercTOdisplay ) )
@@ -1028,7 +1028,7 @@ INT16 CharacterIsGettingPathPlotted( INT16 sCharNumber )
 	else
 	{
 		// if he is *the* selected dude
-		if( bSelectedDestChar == sCharNumber + FIRSTmercTOdisplay )
+		if( GetSelectedDestChar() == sCharNumber + FIRSTmercTOdisplay )
 		{
 			return ( TRUE );
 		}
@@ -1263,7 +1263,7 @@ void JumpToLevel( INT32 iLevel )
 		return;
 
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -1393,7 +1393,7 @@ void HandleDisplayOfSelectedMercArrows( void )
 		if( gCharactersList[ ubCount + FIRSTmercTOdisplay ].fValid == TRUE )
 		{
 			// are they in the selected list or int he same mvt group as this guy
-			if( ( IsEntryInSelectedListSet( ubCount + FIRSTmercTOdisplay ) == TRUE ) || ( ( bSelectedDestChar != - 1 ) ? ( ( Menptr[ gCharactersList[ ubCount + FIRSTmercTOdisplay ].usSolID ].ubGroupID != 0 ) ? ( Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ].ubGroupID == Menptr[ gCharactersList[ ubCount + FIRSTmercTOdisplay ].usSolID ].ubGroupID ) : FALSE ) : FALSE ) )
+			if( ( IsEntryInSelectedListSet( ubCount + FIRSTmercTOdisplay ) == TRUE ) || ( ( GetSelectedDestChar() != - 1 ) ? ( ( Menptr[ gCharactersList[ ubCount + FIRSTmercTOdisplay ].usSolID ].ubGroupID != 0 ) ? ( Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ].ubGroupID == Menptr[ gCharactersList[ ubCount + FIRSTmercTOdisplay ].usSolID ].ubGroupID ) : FALSE ) : FALSE ) )
 			{
 				sYPosition = Y_START+( ubCount * ( Y_SIZE + 2) ) - 1;
 
@@ -2564,7 +2564,7 @@ void GoToNextCharacterInList( void )
 		return;
 	}
 
-	if( ( bSelectedDestChar != -1 ) || fPlotForHelicopter || fPlotForMilitia )
+	if( ( GetSelectedDestChar() != -1 ) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -2608,7 +2608,7 @@ void GoToFirstCharacterInList( void )
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -2634,7 +2634,7 @@ void GoToLastCharacterInList( void )
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -2652,31 +2652,25 @@ void GoToLastCharacterInList( void )
 
 void GoToPrevCharacterInList( void )
 {
-	INT32 iCounter = 0, iCount = 0;
-
-
 	if( fShowDescriptionFlag == TRUE )
 	{
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
 
 	// is the current guy invalid or the first one?
+	INT32 iCount = bSelectedInfoChar - 1;
 	if( ( bSelectedInfoChar == -1 ) || ( bSelectedInfoChar == 0 ) )
 	{
 		iCount = giMAXIMUM_NUMBER_OF_PLAYER_SLOTS;
 	}
-	else
-	{
-		iCount = bSelectedInfoChar - 1;
-	}
 
 	// now run through the list and find first prev guy
-	for( iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; iCounter++ )
+	for( INT32 iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; ++iCounter )
 	{
 		if ( ( gCharactersList[ iCount ].fValid ) && ( iCount < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS ) && ValidSelectableCharForNextOrPrev( iCount ) )
 		{
@@ -2790,14 +2784,11 @@ void ShutDownUserDefineHelpTextRegions( void )
 // user is to pass in the x,y position of the box, the width to wrap the strings and the string itself
 BOOLEAN SetUpFastHelpListRegions( INT32 iXPosition[], INT32 iYPosition[], INT32 iWidth[], STR16 sString[], INT32 iSize )
 {
-	INT32 iCounter = 0;
-
 	// reset the size
 	giSizeOfInterfaceFastHelpTextList = 0;
 
-	for( iCounter = 0; iCounter < iSize; iCounter++ )
+	for( INT32 iCounter = 0; iCounter < iSize; ++iCounter )
 	{
-
 		// forgiving way of making sure we don't go too far
 		CHECKF( iCounter < MAX_MAPSCREEN_FAST_HELP );
 
@@ -4561,7 +4552,7 @@ void HandleSettingTheSelectedListOfMercs( void )
 	BOOLEAN fSelected;
 
 	// reset the selected character
-	bSelectedDestChar = -1;
+	SetSelectedDestChar( -1 );
 
 	// run through the list of grunts
 	for( iCounter = 0; iCounter < giMAXIMUM_NUMBER_OF_PLAYER_SLOTS; iCounter++ )
@@ -4589,7 +4580,7 @@ void HandleSettingTheSelectedListOfMercs( void )
 					// yes, then set them as the destination plotting character for movement arrow purposes
 					fFirstOne = FALSE;
 
-					bSelectedDestChar = ( INT8 )iCounter;
+					SetSelectedDestChar(( INT8 )iCounter );
 					// make DEST column glow
 					giDestHighLine = iCounter;
 
@@ -4602,7 +4593,7 @@ void HandleSettingTheSelectedListOfMercs( void )
 		}
 	}
 
-	if( bSelectedDestChar != -1 )
+	if( GetSelectedDestChar() != -1 )
 	{
 		// set cursor
 		SetUpCursorForStrategicMap( );
@@ -4610,7 +4601,7 @@ void HandleSettingTheSelectedListOfMercs( void )
 		fMapPanelDirty = TRUE;
 		fCharacterInfoPanelDirty = TRUE;
 
-		DeselectSelectedListMercsWhoCantMoveWithThisGuy( &( Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ] ) );
+		DeselectSelectedListMercsWhoCantMoveWithThisGuy( &( Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ] ) );
 
 		// remember the current paths for all selected characters so we can restore them if need be
 		RememberPreviousPathForAllSelectedChars();

Strategic/PreBattle Interface.cpp

@@ -298,7 +298,7 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
 	gAmbushRadiusModifier = 0.0f;
 
 	// ARM: Feb01/98 - Cancel out of mapscreen movement plotting if PBI subscreen is coming up
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}

Strategic/Strategic Movement.cpp

@@ -3410,34 +3410,42 @@ INT32 GetSectorMvtTimeForGroup( UINT8 ubSector, UINT8 ubDirection, GROUP *pGroup
 {
 	INT32 iTraverseTime;
 	INT32 iBestTraverseTime = 1000000;
-	INT32 iEncumbrance, iHighestEncumbrance = 0;
+	INT32 iEncumbrance = 0;
+	static INT32 iHighestEncumbrance = 0;
 	SOLDIERTYPE *pSoldier;
 	PLAYERGROUP *curr;
 	BOOLEAN fFoot, fCar, fTruck, fTracked, fAir;
 	UINT8 ubTraverseType;
 	UINT8 ubTraverseMod;
 
+	// see if we have any survivalist here
+	static float fSurvivalistHere = 0;
+	// background bonuses
+	static INT8 stravelbackground_foot = 20;
+	static INT8 stravelbackground_car = -20;
+	static INT8 stravelbackground_air = -20;
+
 	// THIS FUNCTION WAS WRITTEN TO HANDLE MOVEMENT TYPES WHERE MORE THAN ONE TRANSPORTAION TYPE IS AVAILABLE.
-
-	//Determine the group's method(s) of tranportation. If more than one,
-	//we will always use the highest time.
-	// WANNE: If we have an old savegame (from the dev. trunk, where the skyrider can only move on roads), just change the "pGroup->ubTransportationMask" to 16 for the heli to fix it in the savegame
-	fFoot = (UINT8)(pGroup->ubTransportationMask & FOOT);
-	fCar = (UINT8)(pGroup->ubTransportationMask & CAR);
-	fTruck = (UINT8)(pGroup->ubTransportationMask & TRUCK);
-	fTracked = (UINT8)(pGroup->ubTransportationMask & TRACKED);
-	fAir = (UINT8)(pGroup->ubTransportationMask & AIR);
-
+		
 	ubTraverseType = SectorInfo[ ubSector ].ubTraversability[ ubDirection ];
 
 	if( ubTraverseType == EDGEOFWORLD )
 		return 0xffffffff; //can't travel here!
 
+	//Determine the group's method(s) of tranportation. If more than one,
+	//we will always use the highest time.
+	// WANNE: If we have an old savegame (from the dev. trunk, where the skyrider can only move on roads), just change the "pGroup->ubTransportationMask" to 16 for the heli to fix it in the savegame
+	fFoot = pGroup->ubTransportationMask & FOOT;
+	fCar = pGroup->ubTransportationMask & CAR;
+	fTruck = pGroup->ubTransportationMask & TRUCK;
+	fTracked = pGroup->ubTransportationMask & TRACKED;
+	fAir = pGroup->ubTransportationMask & AIR;
+
 	// ARM: Made air-only travel take its normal time per sector even through towns. Because Skyrider charges by the sector,
 	// not by flying time, it's annoying when his default route detours through a town to save time, but costs extra money.
 	// This isn't exactly unrealistic, since the chopper shouldn't be faster flying over a town anyway... Not that other
 	// kinds of travel should be either - but the towns represents a kind of warping of our space-time scale as it is...
-	if( ( ubTraverseType == TOWN ) && ( pGroup->ubTransportationMask != AIR ) )
+	if( ( ubTraverseType == TOWN ) && !fAir )
 		return 5; //very fast, and vehicle types don't matter.
 
 	if( fFoot )
@@ -3468,27 +3476,57 @@ INT32 GetSectorMvtTimeForGroup( UINT8 ubSector, UINT8 ubDirection, GROUP *pGroup
 		if ( pGroup->usGroupTeam == OUR_TEAM )
 		{
 			curr = pGroup->pPlayerList;
-			while( curr )
+
+			// Flugente: this function gets called a lot during pathing, so much that it can lead to lag. As weight remains the same while plotting a path, only do this if something has changed
+			if ( gSquadEncumbranceCheckNecessary )
 			{
-				pSoldier = curr->pSoldier;
-				if( pSoldier->bAssignment != VEHICLE )
+				// reset values
+				iHighestEncumbrance = 0;
+				fSurvivalistHere = 0;
+				stravelbackground_foot = 20;
+				stravelbackground_car = -20;
+				stravelbackground_air = -20;
+
+				while ( curr )
 				{
-					//Soldier is on foot and travelling. Factor encumbrance into movement rate.
-					iEncumbrance = CalculateCarriedWeight( pSoldier );
-
-					// Flugente: we are a lot slower if our leg is severely damaged, even if we can handle the weight
-					if ( gGameExternalOptions.fDisease
-						&& gGameExternalOptions.fDiseaseSevereLimitations
-						&& pSoldier->HasDiseaseWithFlag( DISEASE_PROPERTY_LIMITED_USE_LEGS ) )
-						iEncumbrance = max( iEncumbrance * 2, 200);
-
-					if( iEncumbrance > iHighestEncumbrance )
+					pSoldier = curr->pSoldier;
+					if ( pSoldier->bAssignment != VEHICLE )
 					{
-						iHighestEncumbrance = iEncumbrance;
+						//Soldier is on foot and travelling. Factor encumbrance into movement rate.
+						iEncumbrance = CalculateCarriedWeight( pSoldier );
+
+						// Flugente: we are a lot slower if our leg is severely damaged, even if we can handle the weight
+						if ( gGameExternalOptions.fDisease
+							&& gGameExternalOptions.fDiseaseSevereLimitations
+							&& pSoldier->HasDiseaseWithFlag( DISEASE_PROPERTY_LIMITED_USE_LEGS ) )
+							iEncumbrance = max( iEncumbrance * 2, 200 );
+
+						if ( iEncumbrance > iHighestEncumbrance )
+						{
+							iHighestEncumbrance = iEncumbrance;
+						}
 					}
+
+					if ( gGameOptions.fNewTraitSystem )
+					{
+						fSurvivalistHere += NUM_SKILL_TRAITS( pSoldier, SURVIVAL_NT );
+
+						// Flugente: backgrounds
+						// silversurfer: Why the different calculations and defaults?
+						// Well, a slow soldier on foot can slow the whole team down, but one fast soldier won't make the whole team quicker. He is no survivalist after all.
+						// A good driver on the other hand will drive faster and since the team is on the same vehicle, they all will be faster.
+						// A merc with flight experience can pose as co-pilot and provide some assistance to the pilot, so again the whole team profits.
+						stravelbackground_foot = min( stravelbackground_foot, pSoldier->GetBackgroundValue( BG_TRAVEL_FOOT ) );
+						stravelbackground_car = max( stravelbackground_car, pSoldier->GetBackgroundValue( BG_TRAVEL_CAR ) );
+						stravelbackground_air = max( stravelbackground_air, pSoldier->GetBackgroundValue( BG_TRAVEL_AIR ) );
+					}
+
+					curr = curr->next;
 				}
-				curr = curr->next;
+
+				gSquadEncumbranceCheckNecessary = false;
 			}
+
 			if( iHighestEncumbrance > 100 )
 			{
 				iBestTraverseTime = iBestTraverseTime * iHighestEncumbrance / 100;
@@ -3559,31 +3597,6 @@ INT32 GetSectorMvtTimeForGroup( UINT8 ubSector, UINT8 ubDirection, GROUP *pGroup
 	// SANDRO - STOMP traits - ranger reduces time needed for travelling around
 	if ( pGroup->usGroupTeam == OUR_TEAM && gGameOptions.fNewTraitSystem )
 	{
-		// see if we have any survivalist here
-		float fSurvivalistHere = 0;
-		// background bonuses
-		INT8 stravelbackground_foot = 20;
-		INT8 stravelbackground_car = -20;
-		INT8 stravelbackground_air = -20;
-
-		curr = pGroup->pPlayerList;
-		while( curr )
-		{
-			pSoldier = curr->pSoldier;
-			
-			fSurvivalistHere += NUM_SKILL_TRAITS( pSoldier, SURVIVAL_NT );
-			
-			// Flugente: backgrounds
-			// silversurfer: Why the different calculations and defaults?
-			// Well, a slow soldier on foot can slow the whole team down, but one fast soldier won't make the whole team quicker. He is no survivalist after all.
-			// A good driver on the other hand will drive faster and since the team is on the same vehicle, they all will be faster.
-			// A merc with flight experience can pose as co-pilot and provide some assistance to the pilot, so again the whole team profits.
-			stravelbackground_foot = min(stravelbackground_foot, pSoldier->GetBackgroundValue(BG_TRAVEL_FOOT));
-			stravelbackground_car  = max(stravelbackground_car, pSoldier->GetBackgroundValue(BG_TRAVEL_CAR));
-			stravelbackground_air  = max(stravelbackground_air,  pSoldier->GetBackgroundValue(BG_TRAVEL_AIR));
-
-			curr = curr->next;
-		}
 		// yes, we have...
 		if ( (fSurvivalistHere && !fAir) || (stravelbackground_foot && fFoot) || (stravelbackground_car && (fCar || fTruck || fTracked)) || (stravelbackground_air && fAir) )
 		{

Strategic/mapscreen.cpp

@@ -2284,7 +2284,7 @@ void DrawCharBars( void )
 
 	// will draw the heath, morale and breath bars for a character being displayed in the upper left hand corner
 
-	if( ( bSelectedInfoChar == -1 )&&( bSelectedDestChar == -1 ) )
+	if ( ( bSelectedInfoChar == -1 ) && ( GetSelectedDestChar() == -1 ) )
 	{
 		// error, no character to display right now
 		return;
@@ -2298,7 +2298,7 @@ void DrawCharBars( void )
 		}
 		else
 		{
-			usSoldierID=gCharactersList[ bSelectedDestChar ].usSolID;
+			usSoldierID=gCharactersList[GetSelectedDestChar()].usSolID;
 		}
 
 		// grab soldier's id number
@@ -3325,7 +3325,7 @@ INT32 GetPathTravelTimeDuringPlotting( PathStPtr pPath )
 	UINT8 ubGroupId = 0;
 	BOOLEAN fSkipFirstNode = FALSE;
 
-	if ( (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+	if ( ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 	{
 		return( 0 );
 	}
@@ -3361,39 +3361,39 @@ INT32 GetPathTravelTimeDuringPlotting( PathStPtr pPath )
 	else
 	{
 		// plotting for a character...
-		if( Menptr[gCharactersList[bSelectedDestChar].usSolID].bAssignment == VEHICLE )
+		if( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bAssignment == VEHICLE )
 		{
-			ubGroupId = pVehicleList[ Menptr[gCharactersList[bSelectedDestChar].usSolID].iVehicleId ].ubMovementGroup;
+			ubGroupId = pVehicleList[ Menptr[gCharactersList[GetSelectedDestChar()].usSolID].iVehicleId ].ubMovementGroup;
 			pGroup = GetGroup( ubGroupId );
 
 			if( pGroup == NULL )
 			{
-				SetUpMvtGroupForVehicle( &( Menptr[gCharactersList[bSelectedDestChar].usSolID] ) );
+				SetUpMvtGroupForVehicle( &( Menptr[gCharactersList[GetSelectedDestChar()].usSolID] ) );
 
 				// get vehicle id
-				ubGroupId = pVehicleList[ Menptr[gCharactersList[bSelectedDestChar].usSolID].iVehicleId ].ubMovementGroup;
+				ubGroupId = pVehicleList[ Menptr[gCharactersList[GetSelectedDestChar()].usSolID].iVehicleId ].ubMovementGroup;
 				pGroup = GetGroup( ubGroupId );
 				AssertNotNIL(pGroup);
 			}
 		}
-		else if( Menptr[gCharactersList[bSelectedDestChar].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE )
+		else if( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE )
 		{
-			ubGroupId = pVehicleList[ Menptr[gCharactersList[bSelectedDestChar].usSolID].bVehicleID ].ubMovementGroup;
+			ubGroupId = pVehicleList[ Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bVehicleID ].ubMovementGroup;
 			pGroup = GetGroup( ubGroupId );
 
 			if( pGroup == NULL )
 			{
-				SetUpMvtGroupForVehicle( &( Menptr[gCharactersList[bSelectedDestChar].usSolID] ) );
+				SetUpMvtGroupForVehicle( &( Menptr[gCharactersList[GetSelectedDestChar()].usSolID] ) );
 
 				// get vehicle id
-				ubGroupId = pVehicleList[ Menptr[gCharactersList[bSelectedDestChar].usSolID].bVehicleID ].ubMovementGroup;
+				ubGroupId = pVehicleList[ Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bVehicleID ].ubMovementGroup;
 				pGroup = GetGroup( ubGroupId );
 				AssertNotNIL(pGroup);
 			}
 		}
 		else
 		{
-			ubGroupId = Menptr[gCharactersList[bSelectedDestChar].usSolID].ubGroupID;
+			ubGroupId = Menptr[gCharactersList[GetSelectedDestChar()].usSolID].ubGroupID;
 			pGroup = GetGroup( ( UINT8 )( ubGroupId ) );
 			AssertNotNIL(pGroup);
 		}
@@ -3454,13 +3454,13 @@ void DisplayGroundEta( void )
 	}
 	else
 	{
-		if( bSelectedDestChar == -1 )
+		if( GetSelectedDestChar() == -1 )
 			return;
 
-		if( !gCharactersList[bSelectedDestChar].fValid )
+		if( !gCharactersList[GetSelectedDestChar()].fValid )
 			return;
 
-		iTotalTime = GetGroundTravelTimeOfCharacter( bSelectedDestChar );
+		iTotalTime = GetGroundTravelTimeOfCharacter( GetSelectedDestChar() );
 	}
 
 	// now display it
@@ -3826,7 +3826,7 @@ void LoadCharacters( void )
 	{
 		// no one to show
 		ChangeSelectedInfoChar( -1, TRUE );
-		bSelectedDestChar = -1;
+		SetSelectedDestChar( -1 );
 		bSelectedAssignChar = -1;
 		bSelectedContractChar = -1;
 		fPlotForHelicopter = FALSE;
@@ -5691,7 +5691,7 @@ UINT32 MapScreenHandle(void)
 	}
 
 	// if plotting path
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		// plot out paths
 		PlotPermanentPaths( );
@@ -6382,7 +6382,7 @@ void RenderMapCursorsIndexesAnims( )
 
 
 	// handle highlighting of selected sector ( YELLOW ) - don't show it while plotting movement
-	if ( fDrawCursors && (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+	if ( fDrawCursors && ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 	{
 		// if mouse cursor is over the currently selected sector
 		if( ( gsHighlightSectorX == sSelMapX ) && ( gsHighlightSectorY == sSelMapY ) )
@@ -6512,15 +6512,15 @@ UINT32 HandleMapUI( )
 				// plot for character
 
 				// check for valid character
-				Assert ( bSelectedDestChar != -1 );
-				if ( bSelectedDestChar == -1 )
+				Assert ( GetSelectedDestChar() != -1 );
+				if ( GetSelectedDestChar() == -1 )
 					break;
 
 				// check if last sector in character's path is same as where mouse is
-				if( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[bSelectedDestChar].usSolID] ) != ( sMapX + ( sMapY * MAP_WORLD_X ) ) )
+				if( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[GetSelectedDestChar()].usSolID] ) != ( sMapX + ( sMapY * MAP_WORLD_X ) ) )
 				{
-					sX = ( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[bSelectedDestChar].usSolID]	) % MAP_WORLD_X );
-					sY = ( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[bSelectedDestChar].usSolID]	) / MAP_WORLD_X );
+					sX = ( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[GetSelectedDestChar()].usSolID]	) % MAP_WORLD_X );
+					sY = ( GetLastSectorIdInCharactersPath( &Menptr[gCharactersList[GetSelectedDestChar()].usSolID]	) / MAP_WORLD_X );
 					GetCursorPos(&MousePos);
 					ScreenToClient(ghWindow, &MousePos); // In window coords!
 					RestoreBackgroundForMapGrid( sX, sY );
@@ -6535,10 +6535,10 @@ UINT32 HandleMapUI( )
 					// Can we get go there?	(NULL temp character path)
 					if ( GetLengthOfPath( pTempCharacterPath ) > 0 )
 					{
-						PlotPathForCharacter( &Menptr[gCharactersList[bSelectedDestChar].usSolID], sMapX, sMapY, FALSE );
+						PlotPathForCharacter( &Menptr[gCharactersList[GetSelectedDestChar()].usSolID], sMapX, sMapY, FALSE );
 
 						// copy the path to every other selected character
-						CopyPathToAllSelectedCharacters( GetSoldierMercPathPtr( MercPtrs[ gCharactersList[ bSelectedDestChar ].usSolID ] ) );
+						CopyPathToAllSelectedCharacters( GetSoldierMercPathPtr( MercPtrs[ gCharactersList[GetSelectedDestChar()].usSolID ] ) );
 
 						StartConfirmMapMoveMode( sMapY );
 						fMapPanelDirty = TRUE;
@@ -6746,7 +6746,7 @@ UINT32 HandleMapUI( )
 				if ( gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE || gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE_COLOURED_SAMS )
 				{
 					// if not moving soldiers, and not yet plotting the helicopter
-					if ( (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+					if ( ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 					{
 						// if we're on the surface level, and the click is over the helicopter icon
 						// NOTE: The helicopter icon is NOT necessarily directly over the helicopter's current sector!!!
@@ -6761,7 +6761,7 @@ UINT32 HandleMapUI( )
 				else if ( fShowMilitia )
 				{
 					// if not moving soldiers, and not yet plotting the helicopter
-					if ( (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+					if ( ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 					{
 						if ( !iCurrentMapSectorZ && NumNonPlayerTeamMembersInSector( sMapX, sMapY , MILITIA_TEAM) > 0 )
 						{
@@ -6967,7 +6967,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 						DeleteItemDescriptionBox( );
 					}
 					// plotting movement?
-					else if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+					else if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 					{
 						AbortMovementPlottingMode( );
 					}
@@ -7794,7 +7794,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 					#endif
 						{
 							// ARM: Feb01/98 - Cancel out of mapscreen movement plotting if Help subscreen is coming up
-							if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+							if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 							{
 								AbortMovementPlottingMode( );
 							}
@@ -8115,11 +8115,11 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 					if( ( fCtrl )&&( CHEATER_CHEAT_LEVEL( ) ) )
 					{
 						// check if selected dest char,
-						if ( (bSelectedDestChar != -1) && !fPlotForHelicopter && !fPlotForMilitia && (iCurrentMapSectorZ == 0) && (GetMouseMapXY( &sMapX, &sMapY )) )
+						if ( ( GetSelectedDestChar() != -1) && !fPlotForHelicopter && !fPlotForMilitia && (iCurrentMapSectorZ == 0) && (GetMouseMapXY( &sMapX, &sMapY )) )
 						{
 							INT16 sDeltaX, sDeltaY;
 							INT16 sPrevX, sPrevY;
-							SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[ bSelectedDestChar ].usSolID ];
+							SOLDIERTYPE *pSoldier = MercPtrs[ gCharactersList[GetSelectedDestChar()].usSolID ];
 
 							// can't teleport to where we already are
 							if ( ( sMapX == pSoldier->sSectorX ) && ( sMapY == pSoldier->sSectorY ) )
@@ -8219,7 +8219,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 					// if not already in sector inventory
 					if ( !fShowMapInventoryPool )
 					{
-						if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+						if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 						{
 							AbortMovementPlottingMode( );
 						}
@@ -8512,7 +8512,7 @@ INT32 iCounter2 = 0;
 
 
 	// still plotting movement?
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -8945,7 +8945,7 @@ void PollLeftButtonInMapView( UINT32 *puiNewEvent )
 
 
 				// if in "plot route" mode
-				if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+				if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 				{
 					fEndPlotting = FALSE;
 
@@ -9051,7 +9051,7 @@ void PollRightButtonInMapView( UINT32 *puiNewEvent )
 				}
 
 
-				if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+				if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 				{
 					// cancel/shorten the path
 					*puiNewEvent = MAP_EVENT_CANCEL_PATH;
@@ -10168,9 +10168,9 @@ void DisplayThePotentialPathForCurrentDestinationCharacterForMapScreenInterface(
 	INT32 iDifference = 0;
 
 
-	if( bOldDestChar != bSelectedDestChar )
+	if( bOldDestChar != GetSelectedDestChar() )
 	{
-		bOldDestChar = bSelectedDestChar;
+		bOldDestChar = GetSelectedDestChar();
 	giPotCharPathBaseTime = GetJA2Clock( );
 
 		sPrevMapX = sMapX;
@@ -10197,12 +10197,12 @@ void DisplayThePotentialPathForCurrentDestinationCharacterForMapScreenInterface(
 		fDrawTempPath = FALSE;
 	}
 
-	iDifference = GetJA2Clock( ) - giPotCharPathBaseTime ;
-
-	if( fTempPathAlreadyDrawn == TRUE )
+	if ( fTempPathAlreadyDrawn == TRUE )
 	{
 		return;
 	}
+	
+	iDifference = GetJA2Clock( ) - giPotCharPathBaseTime;
 
 	if( iDifference > MIN_WAIT_TIME_FOR_TEMP_PATH )
 	{
@@ -10210,8 +10210,6 @@ void DisplayThePotentialPathForCurrentDestinationCharacterForMapScreenInterface(
 		giPotCharPathBaseTime = GetJA2Clock( );
 		fTempPathAlreadyDrawn = TRUE;
 	}
-
-	return;
 }
 
 
@@ -10233,7 +10231,7 @@ void SetUpCursorForStrategicMap( void )
 		}
 		else
 		{
-			if( bSelectedDestChar == -1 )
+			if( GetSelectedDestChar() == -1 )
 			{
 				// no plot mode, reset cursor to normal
 				ChangeMapScreenMaskCursor( CURSOR_NORMAL );
@@ -10241,7 +10239,7 @@ void SetUpCursorForStrategicMap( void )
 			else	// yes - by character
 			{
 				// set cursor based on foot or vehicle
-				if( ( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].bAssignment != VEHICLE ) && !( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE ) )
+				if( ( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bAssignment != VEHICLE ) && !( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE ) )
 				{
 					ChangeMapScreenMaskCursor( CURSOR_STRATEGIC_FOOT );
 				}
@@ -10275,7 +10273,7 @@ void HandleAnimatedCursorsForMapScreen( )
 void AbortMovementPlottingMode( void )
 {
 	// invalid if we're not plotting movement
-	Assert( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia );
+	Assert( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia );
 
 	// make everybody go back to where they were going before this plotting session started
 	RestorePreviousPaths();
@@ -10312,7 +10310,7 @@ void AbortMovementPlottingMode( void )
 	giDestHighLine = -1;
 
 	// cancel movement mode
-	bSelectedDestChar = -1;
+	SetSelectedDestChar( -1 );
 	fPlotForHelicopter = FALSE;
 	
 	if ( fPlotForMilitia )
@@ -10359,7 +10357,7 @@ void CheckToSeeIfMouseHasLeftMapRegionDuringPathPlotting(	)
 			fInArea = FALSE;
 
 			// plotting path, clean up
-			if ( ((bSelectedDestChar != -1) || fPlotForHelicopter || fDrawTempHeliPath || fPlotForMilitia || fDrawTempMilitiaPath ) && fTempPathAlreadyDrawn )
+			if ( (( GetSelectedDestChar() != -1) || fPlotForHelicopter || fDrawTempHeliPath || fPlotForMilitia || fDrawTempMilitiaPath ) && fTempPathAlreadyDrawn )
 			{
 				fDrawTempHeliPath = FALSE;
 				fDrawTempMilitiaPath = FALSE;
@@ -10766,7 +10764,7 @@ void TeamListInfoRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 
 			// reset character
 			bSelectedAssignChar = -1;
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			bSelectedContractChar = -1;
 			fPlotForHelicopter = FALSE;
 			fPlotForMilitia = FALSE;
@@ -10819,7 +10817,7 @@ void TeamListInfoRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 
 			// reset character
 			bSelectedAssignChar = -1;
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			bSelectedContractChar = -1;
 			fPlotForHelicopter = FALSE;
 			fPlotForMilitia = FALSE;
@@ -10927,7 +10925,7 @@ void TeamListAssignmentRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 			RebuildAssignmentsBox( );
 
 			// reset dest character
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			fPlotForHelicopter = FALSE;
 			fPlotForMilitia = FALSE;
 
@@ -11000,7 +10998,7 @@ void TeamListAssignmentRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 
 			// reset character
 			bSelectedAssignChar = -1;
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			bSelectedContractChar = -1;
 			fPlotForHelicopter = FALSE;
 			fPlotForMilitia = FALSE;
@@ -11179,7 +11177,7 @@ void TeamListDestinationRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 
 
 				// select this character as the one plotting strategic movement
-				bSelectedDestChar = ( INT8 )iValue + FIRSTmercTOdisplay;
+				SetSelectedDestChar( (INT8)iValue + FIRSTmercTOdisplay );
 
 				// remember the current paths for all selected characters so we can restore them if need be
 				RememberPreviousPathForAllSelectedChars();
@@ -11271,9 +11269,9 @@ void TeamListDestinationRegionMvtCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 	{
 		giHighLine = -1;
 
-		if( bSelectedDestChar == -1 )
+		if( GetSelectedDestChar() == -1 )
 		{
-		giDestHighLine = -1;
+			giDestHighLine = -1;
 		}
 
 		// restore background
@@ -11458,7 +11456,7 @@ void TeamListContractRegionBtnCallBack(MOUSE_REGION *pRegion, INT32 iReason )
 			// reset character
 			giDestHighLine = -1;
 			bSelectedAssignChar = -1;
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			bSelectedContractChar = -1;
 			fPlotForHelicopter = FALSE;
 			fPlotForMilitia = FALSE;
@@ -11620,9 +11618,9 @@ void PlotPermanentPaths( void )
 	{
 		DisplayMilitiaPath();
 	}
-	else if( bSelectedDestChar != -1 )
+	else if( GetSelectedDestChar() != -1 )
 	{
-		DisplaySoldierPath( &Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ] );
+		DisplaySoldierPath( &Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ] );
 	}
 }
 
@@ -11675,9 +11673,9 @@ void PlotTemporaryPaths( void )
 			}
 		}
 		// dest char has been selected,
-		else if( bSelectedDestChar != -1 )
+		else if( GetSelectedDestChar() != -1 )
 		{
-			PlotATemporaryPathForCharacter( &Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ], sMapX, sMapY );
+			PlotATemporaryPathForCharacter( &Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ], sMapX, sMapY );
 
 			// check to see if we are drawing path
 			DisplayThePotentialPathForCurrentDestinationCharacterForMapScreenInterface( sMapX, sMapY );
@@ -11688,7 +11686,7 @@ void PlotTemporaryPaths( void )
 				// clip region
 				ClipBlitsToMapViewRegion( );
 				// blit
-				DisplaySoldierTempPath( &Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ] );
+				DisplaySoldierTempPath( &Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ] );
 				// restore
 				RestoreClipRegionToFullScreen( );
 			}
@@ -11917,7 +11915,7 @@ void CheckIfPlottingForCharacterWhileAirCraft( void )
 
 	if ( gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE || gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE_COLOURED_SAMS )
 	{
-		if ( (bSelectedDestChar != -1 || fPlotForMilitia) && !fPlotForHelicopter )
+		if ( ( GetSelectedDestChar() != -1 || fPlotForMilitia) && !fPlotForHelicopter )
 			fAbort = TRUE;
 	}
 	else
@@ -11928,7 +11926,7 @@ void CheckIfPlottingForCharacterWhileAirCraft( void )
 
 	if ( fShowMilitia )
 	{
-		if ( (bSelectedDestChar != -1 || fPlotForHelicopter) && !fPlotForMilitia )
+		if ( ( GetSelectedDestChar() != -1 || fPlotForHelicopter) && !fPlotForMilitia )
 			fAbort = TRUE;
 	}
 	else
@@ -12357,7 +12355,7 @@ void ResetAllSelectedCharacterModes( void )
 	giContractHighLine = -1;
 	
 	// if we were plotting movement
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode();
 	}
@@ -12542,34 +12540,34 @@ BOOLEAN CheckIfClickOnLastSectorInPath( INT16 sX, INT16 sY )
 	else	// not doing helicopter movement
 	{
 		// if not doing a soldier either, we shouldn't be here!
-		if( bSelectedDestChar == -1 )
+		if( GetSelectedDestChar() == -1 )
 		{
 			return( FALSE );
 		}
 
 		// invalid soldier?	we shouldn't be here!
-		if( gCharactersList[ bSelectedDestChar ].fValid == FALSE )
+		if( gCharactersList[GetSelectedDestChar()].fValid == FALSE )
 		{
-			bSelectedDestChar = -1;
+			SetSelectedDestChar( -1 );
 			return( FALSE );
 		}
 
-		if( sX + ( sY * MAP_WORLD_X ) == GetLastSectorIdInCharactersPath( ( &Menptr[ gCharactersList[ bSelectedDestChar ].usSolID ] ) ) )
+		if( sX + ( sY * MAP_WORLD_X ) == GetLastSectorIdInCharactersPath( ( &Menptr[ gCharactersList[GetSelectedDestChar()].usSolID ] ) ) )
 		{
 			// clicked on last sector, reset plotting mode
 
 			// if he's IN a vehicle or IS a vehicle
-			if( ( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].bAssignment == VEHICLE ) || ( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE ) )
+			if( ( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bAssignment == VEHICLE ) || ( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].flags.uiStatusFlags & SOLDIER_VEHICLE ) )
 			{
-				if( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].bAssignment == VEHICLE )
+				if( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bAssignment == VEHICLE )
 				{
 					// IN a vehicle
-					iVehicleId = Menptr[gCharactersList[ bSelectedDestChar ].usSolID].iVehicleId;
+					iVehicleId = Menptr[gCharactersList[GetSelectedDestChar()].usSolID].iVehicleId;
 				}
 				else
 				{
 					// IS a vehicle
-					iVehicleId = Menptr[gCharactersList[ bSelectedDestChar ].usSolID].bVehicleID;
+					iVehicleId = Menptr[gCharactersList[GetSelectedDestChar()].usSolID].bVehicleID;
 				}
 
 				// rebuild waypoints - vehicles
@@ -12578,13 +12576,13 @@ BOOLEAN CheckIfClickOnLastSectorInPath( INT16 sX, INT16 sY )
 			else
 			{
 				// rebuild waypoints - mercs on foot
-				ppMovePath = &( Menptr[gCharactersList[ bSelectedDestChar ].usSolID].pMercPath );
+				ppMovePath = &( Menptr[gCharactersList[GetSelectedDestChar()].usSolID].pMercPath );
 			}
 
 			RebuildWayPointsForAllSelectedCharsGroups( );
 
 			// pointer to previous character path
-			pPreviousMercPath = gpCharacterPreviousMercPath[ bSelectedDestChar ];
+			pPreviousMercPath = gpCharacterPreviousMercPath[GetSelectedDestChar()];
 
 			fLastSectorInPath = TRUE;
 		}
@@ -12690,7 +12688,7 @@ void UpdateCursorIfInLastSector( void )
 	INT16 sMapX = 0, sMapY = 0;
 
 	// check to see if we are plotting a path, if so, see if we are highlighting the last sector int he path, if so, change the cursor
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		GetMouseMapXY(&sMapX, &sMapY);
 
@@ -12740,10 +12738,10 @@ void UpdateCursorIfInLastSector( void )
 		}
 		else
 		{
-			if ( bSelectedDestChar != -1 )
+			if ( GetSelectedDestChar() != -1 )
 			{
 				//c heck if we are in the last sector of the characters path?
-				if ( sMapX + (sMapY * MAP_WORLD_X) == GetLastSectorIdInCharactersPath( (&Menptr[gCharactersList[bSelectedDestChar].usSolID]) ) )
+				if ( sMapX + (sMapY * MAP_WORLD_X) == GetLastSectorIdInCharactersPath( (&Menptr[gCharactersList[GetSelectedDestChar()].usSolID]) ) )
 				{
 					// set cursor to checkmark
 					ChangeMapScreenMaskCursor( CURSOR_CHECKMARK );
@@ -12874,7 +12872,7 @@ void HandleChangeOfHighLightedLine( void )
 			giSleepHighLine = -1;
 
 			// don't do during plotting, allowing selected character to remain highlighted and their destination column to glow!
-			if ( (bSelectedDestChar == -1) && !fPlotForHelicopter && !fPlotForMilitia )
+			if ( ( GetSelectedDestChar() == -1) && !fPlotForHelicopter && !fPlotForMilitia )
 			{
 				giDestHighLine = -1;
 			}
@@ -14539,7 +14537,7 @@ void ChangeSelectedMapSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 		return;
 
 	// disallow going underground while plotting (surface) movement
-	if ( ( bMapZ != 0 ) && ( ( bSelectedDestChar != -1 ) || fPlotForHelicopter ) )
+	if ( ( bMapZ != 0 ) && ( ( GetSelectedDestChar() != -1 ) || fPlotForHelicopter ) )
 		return;
 
 	// make sure we don' try to display bad levels
@@ -14756,11 +14754,11 @@ void CancelOrShortenPlottedPath( void )
 	else
 	{
 		// check for character path being plotted
-		if( bSelectedDestChar == -1 )
+		if( GetSelectedDestChar() == -1 )
 			return;
 
 		// try to delete portion of path AFTER the current sector for the helicopter
-		uiReturnValue = ClearPathAfterThisSectorForCharacter( &Menptr[gCharactersList[bSelectedDestChar].usSolID], sMapX, sMapY );
+		uiReturnValue = ClearPathAfterThisSectorForCharacter( &Menptr[gCharactersList[GetSelectedDestChar()].usSolID], sMapX, sMapY );
 	}
 
 	switch ( uiReturnValue )
@@ -15576,7 +15574,7 @@ void DestinationPlottingCompleted( void )
 	ClearPreviousPaths();
 
 	fPlotForHelicopter = FALSE;	
-	bSelectedDestChar = - 1;
+	SetSelectedDestChar( -1 );
 	giDestHighLine = -1;
 	
 	// Flugente: add militia from the starting sector to the group
@@ -15723,7 +15721,7 @@ void StartChangeSectorArrivalMode( void )
 BOOLEAN CanMoveBullseyeAndClickedOnIt( INT16 sMapX, INT16 sMapY )
 {
 	// if in airspace mode, and not plotting paths
-	if ( (gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE || gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE_COLOURED_SAMS) && (bSelectedDestChar == -1) && (fPlotForHelicopter == FALSE) )
+	if ( (gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE || gusMapDisplayColourMode == MAP_DISPLAY_AIRSPACE_COLOURED_SAMS) && ( GetSelectedDestChar() == -1) && (fPlotForHelicopter == FALSE) )
 	{
 		if (is_networked)
 		{
@@ -16102,7 +16100,7 @@ void RestorePreviousPaths( void )
 	BOOLEAN fPathChanged = FALSE;
 
 	// invalid if we're not plotting movement
-	Assert( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia );
+	Assert( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia );
 
 	if ( fPlotForHelicopter )
 	{
@@ -16368,7 +16366,7 @@ void RequestToggleMercInventoryPanel( void )
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -16421,7 +16419,7 @@ void RequestContractMenu( void )
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}
@@ -16484,7 +16482,7 @@ void ChangeCharacterListSortMethod( INT32 iValue )
 		return;
 	}
 
-	if ( (bSelectedDestChar != -1) || fPlotForHelicopter || fPlotForMilitia )
+	if ( ( GetSelectedDestChar() != -1) || fPlotForHelicopter || fPlotForMilitia )
 	{
 		AbortMovementPlottingMode( );
 	}

Tactical/Militia Control.cpp

@@ -445,7 +445,7 @@ void DetermineWhichMilitiaControlMenusCanBeShown( void )
 	{
 		if( fShowMapScreenMovementList == TRUE )
 		{
-			if( bSelectedDestChar == -1 )
+			if( GetSelectedDestChar() == -1 )
 			{
 				fCharacterNoLongerValid = TRUE;
 				//HandleShowingOfMovementBox( ); //laltodo