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
This commit is contained in:
Sergeant_Kolja
2007-03-03 17:27:17 +00:00
parent 431b92c26e
commit 29052abd73
3 changed files with 188 additions and 44 deletions
+7 -1
View File
@@ -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