- bugfix: CTD after talking to Darren in San Mona (in the boxing club)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-11-12 17:36:50 +00:00
parent b5601c78d9
commit ac117f7143
2 changed files with 9 additions and 4 deletions
+9 -4
View File
@@ -300,10 +300,15 @@ BOOLEAN CheckOnBoxers( void )
for( uiLoop = 0; uiLoop < NUM_BOXERS; uiLoop++ )
{
ubID = WhoIsThere2( gsBoxerGridNo[ uiLoop ], 0 );
if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT )
{
// no weapon so this guy is a boxer
gubBoxerID[ uiLoop ] = ubID;
// WANNE: Safty check!
if (ubID < TOTAL_SOLDIERS)
{
if ( FindObjClass( MercPtrs[ ubID ], IC_WEAPON ) == NO_SLOT )
{
// no weapon so this guy is a boxer
gubBoxerID[ uiLoop ] = ubID;
}
}
}
}