Fixed again more bugs which occurred when loading a 1.13 savegame which was saved under an older 1.13 build or under different XML-files. The bug is now better fixed than before.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2026-07-22 13:40:22 +02:00 · 2007-03-03 17:27:17 +00:00
parent 431b92c26e
commit 29052abd73
3 changed files with 188 additions and 44 deletions
@@ -209,6 +209,9 @@ extern GARRISON_GROUP *gGarrisonGroup;
 extern INT32 giGarrisonArraySize;


+extern void Enshure_RepairedGarrisonGroup( GARRISON_GROUP **ppGarrison, INT32 *pGarraySize );
+
+

 UINT16 gwGroupTypeString[ NUM_ENEMY_INTENTIONS ][ 20 ] =
 {
@@ -454,6 +457,7 @@ void RenderStationaryGroups()
 	SetFontShadow( FONT_NEARBLACK );

 	GetVideoObject( &hVObject, guiMapIconsID );
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize ); /* added NULL fix, 2007-03-03, Sgt. Kolja */

 	//Render groups that are stationary...
 	for( y = 0; y < 16; y++ )
@@ -1877,11 +1881,12 @@ void PrintDetailedEnemiesInSectorInfo( INT32 iScreenX, INT32 iScreenY, UINT8 ubS


 	pSector = &SectorInfo[ SECTOR( ubSectorX, ubSectorY ) ];
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */

 	// handle garrisoned enemies
 	if( pSector->ubGarrisonID != NO_GARRISON )
 	{
-		iDesired = gArmyComp[ gGarrisonGroup[ pSector->ubGarrisonID ].ubComposition ].bDesiredPopulation;
+   iDesired = gArmyComp[ gGarrisonGroup[ pSector->ubGarrisonID ].ubComposition ].bDesiredPopulation;
 		iSurplus = pSector->ubNumTroops + pSector->ubNumAdmins + pSector->ubNumElites - iDesired;
 		SetFontForeground( FONT_WHITE );

@@ -53,6 +53,10 @@ extern BOOLEAN gfOverrideSector;

 INT16 gsInterrogationGridNo[3] = { 7756, 7757, 7758 };

+
+extern void Enshure_RepairedGarrisonGroup( GARRISON_GROUP **ppGarrison, INT32 *pGarraySize );
+
+
 void ValidateEnemiesHaveWeapons()
 {
 	#ifdef JA2BETAVERSION
@@ -203,7 +207,9 @@ UINT8 NumStationaryEnemiesInSector( INT16 sSectorX, INT16 sSectorY )
 		return( 0 );
 	}
 	
-	// don't count roadblocks as stationary garrison, we want to see how many enemies are in them, not question marks
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
+  // don't count roadblocks as stationary garrison, we want to see how many enemies are in them, not question marks
 	if ( gGarrisonGroup[ pSector->ubGarrisonID ].ubComposition == ROADBLOCK )
 	{
 		// pretend they're not stationary
@@ -491,6 +491,43 @@ enum SAIMOVECODE
 };
 void MoveSAIGroupToSector( GROUP **pGroup, UINT8 ubSectorID, UINT32 uiMoveCode, UINT8 ubIntention );

+
+
+
+/* This is only a dirty fix to prevent CTD: 
+ * when loading a game, sometimes I found that
+ * 'gGarrisonGroup' was not allocated.
+ * so I did:
+ * - added NULL check,
+ * - added some AssertMsg, 
+ * - added new allocation on different places
+ * - condensed this paces to the following function
+ * ---------------------------
+ * 2007-03-03, Sgt. Kolja 
+ */
+ 
+/* PUBLIC */
+void Enshure_RepairedGarrisonGroup( GARRISON_GROUP **ppGarrison, INT32 *pGarraySize )
+{{
+  GARRISON_GROUP *pG;
+
+  pG = *ppGarrison;
+
+  if( !pG )
+    {
+    //AssertMsg( 0, "invalid global Array in" __FILE__ );
+    //return;
+  	 pG = (GARRISON_GROUP*)MemAlloc( sizeof( gOrigGarrisonGroup ) );
+    Assert( pG );
+    memcpy( pG, gOrigGarrisonGroup, sizeof( gOrigGarrisonGroup ) );
+    *pGarraySize = sizeof( gOrigGarrisonGroup ) / sizeof(GARRISON_GROUP);
+    *ppGarrison = pG;
+    }
+  return;  
+}}
+
+
+
 //returns the number of reinforcements permitted to be sent.  Will increased if the denied counter is non-zero.
 INT32 GarrisonReinforcementsRequested( INT32 iGarrisonID, UINT8 *pubExtraReinforcements )
 {
@@ -498,9 +535,11 @@ INT32 GarrisonReinforcementsRequested( INT32 iGarrisonID, UINT8 *pubExtraReinfor
 	INT32 iExistingForces;
 	SECTORINFO *pSector;
 	INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
-DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic1");
+ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic1");

-	pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
+ pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
 	iExistingForces = pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites;
 	iReinforcementsRequested = gArmyComp[ gGarrisonGroup[ iGarrisonID ].ubComposition ].bDesiredPopulation - iExistingForces;

@@ -539,7 +578,9 @@ INT32 ReinforcementsAvailable( INT32 iGarrisonID )
 	SECTORINFO *pSector;
 	INT32 iReinforcementsAvailable;

-	pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
+ pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
 	iReinforcementsAvailable = pSector->ubNumTroops + pSector->ubNumElites + pSector->ubNumAdmins;
 	iReinforcementsAvailable -= gArmyComp[ gGarrisonGroup[ iGarrisonID ].ubComposition ].bDesiredPopulation;

@@ -584,7 +625,10 @@ BOOLEAN PlayerForceTooStrong( UINT8 ubSectorID, UINT16 usOffensePoints, UINT16 *
 void RequestAttackOnSector( UINT8 ubSectorID, UINT16 usDefencePoints )
 {
 	INT32 i;
-	for( i = 0; i < giGarrisonArraySize; i++ )
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
+ for( i = 0; i < giGarrisonArraySize; i++ )
 	{
 		if( gGarrisonGroup[ i ].ubSectorID == ubSectorID && !gGarrisonGroup[ i ].ubPendingGroupID )
 		{
@@ -632,6 +676,9 @@ void ValidatePendingGroups()
 		GROUP *pGroup;
 		INT32 i, iErrorsForInvalidPendingGroup = 0;
 		UINT8 ubGroupID;
+
+   Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 		for( i = 0; i < giPatrolArraySize; i++ )
 		{
 			ubGroupID = gPatrolGroup[ i ].ubPendingGroupID;
@@ -648,15 +695,15 @@ void ValidatePendingGroups()
 		for( i = 0; i < giGarrisonArraySize; i++ )
 		{
 			ubGroupID = gGarrisonGroup[ i ].ubPendingGroupID;
-			if( ubGroupID )
-			{
-				pGroup = GetGroup( ubGroupID );
-				if( !pGroup || pGroup->fPlayer )
+  		if( ubGroupID )
+	  	{
+		  	pGroup = GetGroup( ubGroupID );
+			  if( !pGroup || pGroup->fPlayer )
 				{
-					iErrorsForInvalidPendingGroup++;
-					gGarrisonGroup[ i ].ubPendingGroupID = 0;
-				}
-			}
+  				iErrorsForInvalidPendingGroup++;
+	  			gGarrisonGroup[ i ].ubPendingGroupID = 0;
+		  	}
+		  }
 		}
 		if( iErrorsForInvalidPendingGroup )
 		{
@@ -674,21 +721,25 @@ void ValidateWeights( INT32 iID )
 		INT32 i;
 		INT32 iSumRequestPoints = 0;
 		INT32 iSumReinforcementPoints = 0;
-		for( i = 0; i < giPatrolArraySize; i++ )
-		{
-			iSumRequestPoints += gPatrolGroup[ i ].bWeight;
-		}
-		for( i = 0; i < giGarrisonArraySize; i++ )
-		{
-			if( gGarrisonGroup[ i ].bWeight > 0 )
-			{
-				iSumRequestPoints += gGarrisonGroup[ i ].bWeight;
-			}
-			else if( gGarrisonGroup[ i ].bWeight < 0 )
-			{
-				iSumReinforcementPoints -= gGarrisonGroup[ i ].bWeight; //double negative is positive!
-			}
-		}
+
+   Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+ 
+   for( i = 0; i < giPatrolArraySize; i++ )
+ 	{
+ 		iSumRequestPoints += gPatrolGroup[ i ].bWeight;
+ 	}
+ 	for( i = 0; i < giGarrisonArraySize; i++ )
+ 	{
+ 		if( gGarrisonGroup[ i ].bWeight > 0 )
+ 		{
+ 			iSumRequestPoints += gGarrisonGroup[ i ].bWeight;
+ 		}
+ 		else if( gGarrisonGroup[ i ].bWeight < 0 )
+ 		{
+ 			iSumReinforcementPoints -= gGarrisonGroup[ i ].bWeight; //double negative is positive!
+ 		}
+ 	}
+   
 		if( giReinforcementPoints != iSumReinforcementPoints || giRequestPoints != iSumRequestPoints )
 		{
 			UINT16 str[256];
@@ -1520,6 +1571,8 @@ BOOLEAN EnemyPermittedToAttackSector( GROUP **pGroup, UINT8 ubSectorID )
 	SECTORINFO *pSector;
 	BOOLEAN fPermittedToAttack = TRUE;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+ 
 	pSector = &SectorInfo[ ubSectorID ];
 	fPermittedToAttack = OkayForEnemyToMoveThroughSector( ubSectorID );
 	if( pGroup && *pGroup && pSector->ubGarrisonID != NO_GARRISON )
@@ -1641,7 +1694,7 @@ void HandlePlayerGroupNoticedByGarrison( GROUP *pPlayerGroup, UINT8 ubSectorID )
 	UINT8 ubEnemies;
 	pSector = &SectorInfo[ ubSectorID ];
 	INT32 iMaxEnemyGroupSize = gGameExternalOptions.iMaxEnemyGroupSize;
-DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic4");
+ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic4");

 	//First check to see if the player is at his final destination.
 	if( !GroupAtFinalDestination( pPlayerGroup ) )
@@ -1657,6 +1710,8 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic4");
 		return;
 	}

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( pSector->ubGarrisonID != NO_GARRISON )
 	{
 		//Decide whether or not they will attack them with some of the troops.
@@ -1796,6 +1851,8 @@ BOOLEAN HandleEmptySectorNoticedByPatrolGroup( GROUP *pGroup, UINT8 ubEmptySecto
 	UINT8 ubSectorX = (UINT8)(ubEmptySectorID % 16) + 1;
 	UINT8 ubSectorY = (UINT8)(ubEmptySectorID / 16) + 1;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	ubGarrisonID = SectorInfo[ ubEmptySectorID ].ubGarrisonID;
 	if( ubGarrisonID != NO_GARRISON )
 	{
@@ -1842,6 +1899,8 @@ void HandleEmptySectorNoticedByGarrison( UINT8 ubGarrisonSectorID, UINT8 ubEmpty
 		return;
 	}

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( gGarrisonGroup[ ubDstGarrisonID ].ubPendingGroupID )
 	{ //A group is already on-route, so don't send anybody from here.
 		return;
@@ -1867,6 +1926,8 @@ BOOLEAN ReinforcementsApproved( INT32 iGarrisonID, UINT16 *pusDefencePoints )
 	UINT16 usOffensePoints;
 	UINT8 ubSectorX, ubSectorY;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
 	ubSectorX = (UINT8)SECTORX( gGarrisonGroup[ iGarrisonID ].ubSectorID );
 	ubSectorY = (UINT8)SECTORY( gGarrisonGroup[ iGarrisonID ].ubSectorID );
@@ -1929,7 +1990,9 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic5");
 		return TRUE;
 	}
 	else if( pGroup->pEnemyGroup->ubIntention == REINFORCEMENTS )
-	{ //The group has arrived at the location where he is supposed to reinforce.
+	{ 
+   Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+   //The group has arrived at the location where he is supposed to reinforce.
 		//Step 1 -- Check for matching garrison location
 		for( i = 0; i < giGarrisonArraySize; i++ )
 		{
@@ -2315,7 +2378,10 @@ void CheckEnemyControlledSector( UINT8 ubSectorID )
 	{
 		return;
 	}
-	//First, determine if the sector is still owned by the enemy.  
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+  
+  //First, determine if the sector is still owned by the enemy.  
 	pSector = &SectorInfo[ ubSectorID ];
 	if( pSector->ubGarrisonID != NO_GARRISON )
 	{
@@ -2437,6 +2503,9 @@ void CheckEnemyControlledSector( UINT8 ubSectorID )
 void RemoveGroupFromStrategicAILists( UINT8 ubGroupID )
 {
 	INT32 i;
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	for( i = 0; i < giPatrolArraySize; i++ )
 	{
 		if( gPatrolGroup[ i ].ubGroupID == ubGroupID )
@@ -2503,6 +2572,7 @@ void RecalculateGarrisonWeight( INT32 iGarrisonID )
 	INT32 iWeight, iPrevWeight;
 	INT32 iDesiredPop, iCurrentPop, iPriority;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	ValidateWeights( 6 );

 	pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];
@@ -2545,6 +2615,8 @@ void RecalculateGarrisonWeight( INT32 iGarrisonID )
 void RecalculateSectorWeight( UINT8 ubSectorID )
 {
 	INT32 i;
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	for( i = 0; i < giGarrisonArraySize; i++ )
 	{
 		if( gGarrisonGroup[ i ].ubSectorID == ubSectorID )
@@ -2582,6 +2654,8 @@ INT32 ChooseSuitableGarrisonToProvideReinforcements( INT32 iDstGarrisonID, INT32
 	INT8 bBestWeight;
 	UINT8 ubSectorID;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	//Check to see if we could send reinforcements from Alma.  Only Drassen/Cambria get preferred
 	//service from Alma, due to it's proximity and Alma's purpose as a forward military base.
 	ubSectorID = gGarrisonGroup[ iDstGarrisonID ].ubSectorID;
@@ -2691,6 +2765,7 @@ void SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoints
 	UINT8 ubGroupSize;
 	BOOLEAN fLimitMaxTroopsAllowable = FALSE;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	ValidateWeights( 8 );

 	if( gGarrisonGroup[ iDstGarrisonID ].ubSectorID == SEC_B13 ||
@@ -2923,6 +2998,7 @@ void SendReinforcementsForPatrol( INT32 iPatrolID, GROUP **pOptionalGroup )
 	INT32 iReinforcementsAvailable, iReinforcementsRequested, iReinforcementsApproved;
 	UINT8 ubSrcSectorX, ubSrcSectorY, ubDstSectorX, ubDstSectorY;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	ValidateWeights( 21 );

 	//Determine how many units the patrol group needs.
@@ -3095,6 +3171,8 @@ void EvaluateQueenSituation()

 	iOrigRequestPoints = giRequestPoints;	// debug only!

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	//go through garrisons first
 	for( i = 0; i < giGarrisonArraySize; i++ )
 	{
@@ -3245,13 +3323,26 @@ BOOLEAN SaveStrategicAI( HWFILE hFile )
 			return FALSE;
 	}
 	//Save the garrison information!
+  /* Step 1: fill an EMPTY GARRISON for later padding */
 	memset( &gTempGarrisonGroup, 0, sizeof( GARRISON_GROUP ) );
-	FileWrite( hFile, gGarrisonGroup, giGarrisonArraySize * sizeof( GARRISON_GROUP ), &uiNumBytesWritten );
+  if( giGarrisonArraySize > SAVED_GARRISON_GROUPS )
+    {
+    giGarrisonArraySize = SAVED_GARRISON_GROUPS;
+    }
+
+  /* Step 2: write current Garrison Block of <giGarrisonArraySize> Elements */
+  FileWrite( hFile, gGarrisonGroup, giGarrisonArraySize * sizeof( GARRISON_GROUP ), &uiNumBytesWritten );
 	if( uiNumBytesWritten != giGarrisonArraySize * sizeof( GARRISON_GROUP ) )
 		return FALSE;
+
+  /* Step 3: after doing well, calculate how many Garrisons kept empty (and therefore are not saved) 
+   * in <strategic AI.h> it is defined as MAX_GARRISON_GROUPS 100. To have the same offset for the next field
+   * every time, we have to pad the unused garrisons until we have stored 100
+   */
 	i = SAVED_GARRISON_GROUPS - giGarrisonArraySize;
-	while( i-- )
+	while( i-- > 0 )
 	{
+    /* write an empty garison as a padding filling block */
 		FileWrite( hFile, &gTempGarrisonGroup, sizeof( GARRISON_GROUP ), &uiNumBytesWritten );
 		if( uiNumBytesWritten != sizeof( GARRISON_GROUP ) )
 			return FALSE;
@@ -3407,14 +3498,29 @@ BOOLEAN LoadStrategicAI( HWFILE hFile )
 	{
 		MemFree( gGarrisonGroup );
 	}
-	gGarrisonGroup = (GARRISON_GROUP*)MemAlloc( giGarrisonArraySize * sizeof( GARRISON_GROUP ) );
+
+  /* giGarrisonArraySize has been zero here. Found it several times when loading
+   * a differnet build of JA2.1.13. Now fixed a little bit, I hope.
+   */
+  if( giGarrisonArraySize<iOrigGarrisonArraySize || giGarrisonArraySize<1 )
+    {
+    giGarrisonArraySize = iOrigGarrisonArraySize;
+    }
+  if( giGarrisonArraySize > SAVED_GARRISON_GROUPS )
+    {
+    giGarrisonArraySize = SAVED_GARRISON_GROUPS;
+    }
+
+  gGarrisonGroup = (GARRISON_GROUP*)MemAlloc( giGarrisonArraySize * sizeof( GARRISON_GROUP ) );
+  Assert( gGarrisonGroup );
 	FileRead( hFile, gGarrisonGroup, giGarrisonArraySize * sizeof( GARRISON_GROUP ), &uiNumBytesRead );
 	if( uiNumBytesRead != giGarrisonArraySize * sizeof( GARRISON_GROUP ) )
 	{
 		return FALSE;
 	}
-	i = SAVED_GARRISON_GROUPS - giGarrisonArraySize;
-	while( i-- )
+  /* if the Savegame File contains more Garrisons then our Array, toss the remaining ones into the saucer */
+  i = SAVED_GARRISON_GROUPS - giGarrisonArraySize;
+	while( i-- > 0 ) /* prevent underrun, 2007-03-03, Sgt. Kolja  */
 	{
 		FileRead( hFile, &gTempGarrisonGroup, sizeof( GARRISON_GROUP ), &uiNumBytesRead );
 		if( uiNumBytesRead != sizeof( GARRISON_GROUP ) )
@@ -3453,6 +3559,8 @@ BOOLEAN LoadStrategicAI( HWFILE hFile )
 		InitStrategicMovementCosts();
 	#endif

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( ubSAIVersion < 6 )
 	{ //Reinitialize the costs since they have changed.

@@ -3595,12 +3703,6 @@ BOOLEAN LoadStrategicAI( HWFILE hFile )
 	}
 	if( ubSAIVersion < 19 )
 	{
-    if( !gGarrisonGroup ) /* Sergeant Kolja, 2007-02-20: loading an older Qicksave, I crashed with NULL gGarrisonGroup[] */
-      {
-      gGarrisonGroup = (GARRISON_GROUP*)MemAlloc( sizeof( gOrigGarrisonGroup ) );
-	    Assert( gGarrisonGroup );
-	    memcpy( gGarrisonGroup, gOrigGarrisonGroup, sizeof( gOrigGarrisonGroup ) );
-      }
 		//Clear the garrison in C5
 		gArmyComp[ gGarrisonGroup[ SectorInfo[ SEC_C5 ].ubGarrisonID ].ubComposition ].bPriority = 0;
 		gArmyComp[ gGarrisonGroup[ SectorInfo[ SEC_C5 ].ubGarrisonID ].ubComposition ].bDesiredPopulation = 0;
@@ -3849,6 +3951,8 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Strategic7");
 		return;
 	}

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( gubQueenPriorityPhase > ubNewPhase )
 	{
 		#ifdef JA2BETAVERSION
@@ -4047,6 +4151,8 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 		case STRATEGIC_AI_ACTION_KINGPIN_DEAD:
 			//Immediate send a small garrison to C5 (to discourage access to Tony the dealer)
 			/*
+     Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 * added NULL fix, 2007-03-03, Sgt. Kolja *
+
 			for( i = 0; i < giGarrisonArraySize; i++ )
 			{
 				if( gGarrisonGroup[ i ].ubComposition == SANMONA_SMALL )
@@ -4477,6 +4583,8 @@ void StrategicHandleQueenLosingControlOfSector( INT16 sSectorX, INT16 sSectorY,
 		return;
 	}
 	
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( StrategicMap[ sSectorX + sSectorY * MAP_WORLD_X ].fEnemyControlled )
 	{ //If the sector doesn't belong to the player, then we shouldn't be calling this function!
 		SAIReportError( L"StrategicHandleQueenLosingControlOfSector() was called for a sector that is internally considered to be enemy controlled." );
@@ -4647,6 +4755,9 @@ void RequestHighPriorityGarrisonReinforcements( INT32 iGarrisonID, UINT8 ubSoldi
 	//AssertMsg( giPatrolArraySize == PATROL_GROUPS && giGarrisonArraySize == GARRISON_GROUPS, "Strategic AI -- Patrol and/or garrison group definition mismatch." );
 	ubBestDist = 255;
 	iBestIndex = -1;
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	for( i = 0; i < giPatrolArraySize; i++ )
 	{
 		if( gPatrolGroup[ i ].ubGroupID )
@@ -4773,6 +4884,9 @@ void MassFortifyTowns()
 	SECTORINFO *pSector;
 	GROUP *pGroup;
 	UINT8 ubNumTroops, ubDesiredTroops;
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	for( i = 0; i < giGarrisonArraySize; i++ )
 	{
 		pSector = &SectorInfo[ gGarrisonGroup[ i ].ubSectorID ];
@@ -4805,6 +4919,8 @@ void MassFortifyTowns()

 void RenderAIViewerGarrisonInfo( INT32 x, INT32 y, SECTORINFO *pSector )
 {
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( pSector->ubGarrisonID != NO_GARRISON )
 	{
 		INT32 iDesired, iSurplus;
@@ -4840,6 +4956,8 @@ void RenderAIViewerGarrisonInfo( INT32 x, INT32 y, SECTORINFO *pSector )

 void StrategicHandleMineThatRanOut( UINT8 ubSectorID )
 {
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	switch( ubSectorID )
 	{
 		case SEC_B2:
@@ -4874,6 +4992,8 @@ BOOLEAN GarrisonCanProvideMinimumReinforcements( INT32 iGarrisonID )
 	SECTORINFO *pSector;
 	UINT8 ubSectorX, ubSectorY;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	pSector = &SectorInfo[ gGarrisonGroup[ iGarrisonID ].ubSectorID ];

 	iAvailable = pSector->ubNumAdmins + pSector->ubNumTroops + pSector->ubNumElites;
@@ -4900,6 +5020,8 @@ BOOLEAN GarrisonRequestingMinimumReinforcements( INT32 iGarrisonID )
 	INT32 iDesired;
 	SECTORINFO *pSector;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( gGarrisonGroup[ iGarrisonID ].ubPendingGroupID )
 	{
 		return FALSE;
@@ -5049,7 +5171,7 @@ void UpgradeAdminsToTroops()
 	GROUP *pGroup;
 	INT16 sPatrolIndex;

-
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	// on normal, AI evaluates approximately every 10 hrs.  There are about 130 administrators seeded on the map.
 	// Some of these will be killed by the player.

@@ -5189,6 +5311,7 @@ INT16 FindPatrolGroupIndexForGroupIDPending( UINT8 ubGroupID )
 INT16 FindGarrisonIndexForGroupIDPending( UINT8 ubGroupID )
 {
 	INT16 sGarrisonIndex;
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */

 	for( sGarrisonIndex = 0; sGarrisonIndex < giGarrisonArraySize; sGarrisonIndex++ )
 	{
@@ -5239,6 +5362,7 @@ void ReassignAIGroup( GROUP **pGroup )

 	(*pGroup)->ubSectorIDOfLastReassignment = ubSectorID;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	ClearPreviousAIGroupAssignment( *pGroup );

 	//First thing to do, is teleport the group to be AT the sector he is currently moving from.  Otherwise, the 
@@ -5398,6 +5522,8 @@ void RepollSAIGroup( GROUP *pGroup )
 {
 	INT32 i;
 	Assert( !pGroup->fPlayer );
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	if( GroupAtFinalDestination( pGroup ) )
 	{
 		EvaluateGroupSituation( pGroup );
@@ -5429,6 +5555,8 @@ void RepollSAIGroup( GROUP *pGroup )
 void ClearPreviousAIGroupAssignment( GROUP *pGroup )
 {
 	INT32 i;
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	for( i = 0; i < giPatrolArraySize; i++ )
 	{
 		if( gPatrolGroup[ i ].ubGroupID == pGroup->ubGroupID )
@@ -5498,6 +5626,7 @@ void RemoveSoldiersFromGarrisonBasedOnComposition( INT32 iGarrisonID, UINT8 ubSi
 	UINT8 ubOrigNumTroops;
 	UINT8 ubOrigSize;

+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
 	iCompositionID = gGarrisonGroup[ iGarrisonID ].ubComposition;

 	CalcNumTroopsBasedOnComposition( &ubNumTroops, &ubNumElites, ubSize, iCompositionID );
@@ -5662,6 +5791,7 @@ void ReinitializeUnvisitedGarrisons()
 	//Recreate the compositions
 	memcpy( gArmyComp, gOrigArmyComp, NUM_ARMY_COMPOSITIONS * sizeof( ARMY_COMPOSITION ) );
 	EvolveQueenPriorityPhase( TRUE );
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */

 	//Go through each unvisited sector and recreate the garrison forces based on 
 	//the desired population.
@@ -5728,6 +5858,9 @@ GROUP* FindPendingGroupForGarrisonSector( UINT8 ubSectorID )
 	GROUP *pGroup;
 	SECTORINFO *pSector;
 	pSector = &SectorInfo[ ubSectorID ];
+
+ Enshure_RepairedGarrisonGroup( &gGarrisonGroup, &giGarrisonArraySize );	 /* added NULL fix, 2007-03-03, Sgt. Kolja */
+
 	if( pSector->ubGarrisonID != NO_GARRISON )
 	{
 		if( gGarrisonGroup[ pSector->ubGarrisonID ].ubPendingGroupID )