mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
- Bugfix: Prevent game from CTD, on players end turn, when there are problems updating the light tiles for the corpses. This is an AI feature from "ddd" mod which was added in revision: 3789
Development source trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
+69
-65
@@ -1238,7 +1238,7 @@ UINT32 UIHandleEnterPalEditMode( UI_EVENT *pUIEvent )
|
|||||||
|
|
||||||
UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent )
|
UINT32 UIHandleEndTurn( UI_EVENT *pUIEvent )
|
||||||
{
|
{
|
||||||
CHAR16 zString[128];
|
CHAR16 zString[128];
|
||||||
|
|
||||||
// CANCEL FROM PLANNING MODE!
|
// CANCEL FROM PLANNING MODE!
|
||||||
if ( InUIPlanMode( ) )
|
if ( InUIPlanMode( ) )
|
||||||
@@ -1248,9 +1248,7 @@ CHAR16 zString[128];
|
|||||||
|
|
||||||
// ATE: If we have an item pointer end it!
|
// ATE: If we have an item pointer end it!
|
||||||
CancelItemPointer( );
|
CancelItemPointer( );
|
||||||
|
|
||||||
//ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, TacticalStr[ ENDING_TURN ] );
|
|
||||||
|
|
||||||
if ( CheckForEndOfCombatMode( FALSE ) )
|
if ( CheckForEndOfCombatMode( FALSE ) )
|
||||||
{
|
{
|
||||||
// do nothing...
|
// do nothing...
|
||||||
@@ -1274,76 +1272,82 @@ CHAR16 zString[128];
|
|||||||
SaveGame(SAVE__END_TURN_NUM, zString );
|
SaveGame(SAVE__END_TURN_NUM, zString );
|
||||||
}
|
}
|
||||||
|
|
||||||
////ddd îïòèìèçàöèÿ äëÿ õîäà äðàíèêîâ
|
////ddd îïòèìèçàöèÿ äëÿ õîäà äðàíèêîâ
|
||||||
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT ) )
|
if ( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT ) )
|
||||||
{
|
|
||||||
//UINT32 uiStartTime, uiEndTime;
|
|
||||||
//uiStartTime = GetJA2Clock();
|
|
||||||
|
|
||||||
|
|
||||||
memset( gubWorldTileInLight, FALSE, sizeof( gubWorldTileInLight ) );
|
|
||||||
memset( gubIsCorpseThere, FALSE, sizeof( gubIsCorpseThere ) );
|
|
||||||
memset( gubMerkCanSeeThisTile, FALSE, sizeof( gubMerkCanSeeThisTile ) );
|
|
||||||
//ðàçâåðòêà öèêëà. ïðè èçìåíåíèè WORLD_MAX íà äð.çíà÷. íåîáõîäèìî áóäåò ïîä÷èùàòü õâîñòû! èáî îïàñíûé êîä!!! ;)
|
|
||||||
for(INT32 i=0; i<WORLD_MAX ;i+=4)
|
|
||||||
{
|
|
||||||
gubWorldTileInLight[i] = InLightAtNight(i, gpWorldLevelData[ i ].sHeight);
|
|
||||||
gubIsCorpseThere[i] = IsCorpseAtGridNo( i, gpWorldLevelData[ i ].sHeight );
|
|
||||||
gubWorldTileInLight[i+1] = InLightAtNight(i+1, gpWorldLevelData[ i+1 ].sHeight);
|
|
||||||
gubIsCorpseThere[i+1] = IsCorpseAtGridNo( i+1, gpWorldLevelData[ i+1 ].sHeight );
|
|
||||||
gubWorldTileInLight[i+2] = InLightAtNight(i+2, gpWorldLevelData[ i+2 ].sHeight);
|
|
||||||
gubIsCorpseThere[i+2] = IsCorpseAtGridNo( i+2, gpWorldLevelData[ i+2 ].sHeight );
|
|
||||||
gubWorldTileInLight[i+3] = InLightAtNight(i+3, gpWorldLevelData[ i+3 ].sHeight);
|
|
||||||
gubIsCorpseThere[i+3] = IsCorpseAtGridNo( i+3, gpWorldLevelData[ i+3 ].sHeight );
|
|
||||||
}
|
|
||||||
|
|
||||||
INT32 tcnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
|
|
||||||
SOLDIERTYPE *tS;
|
|
||||||
|
|
||||||
INT16 sXOffset, sYOffset;
|
|
||||||
INT32 sGridNo;UINT16 usSightLimit=0;
|
|
||||||
|
|
||||||
for ( tS = MercPtrs[ tcnt ]; tcnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; tcnt++,tS++ )
|
|
||||||
if ( tS->stats.bLife >= OKLIFE && tS->sGridNo != NOWHERE && tS->bInSector )
|
|
||||||
{
|
{
|
||||||
//loop through all the gridnos that we are interested in
|
memset( gubWorldTileInLight, FALSE, sizeof( gubWorldTileInLight ) );
|
||||||
for (sYOffset = -30; sYOffset <= 30; sYOffset++)
|
memset( gubIsCorpseThere, FALSE, sizeof( gubIsCorpseThere ) );
|
||||||
for (sXOffset = -30; sXOffset <= 30; sXOffset++)
|
memset( gubMerkCanSeeThisTile, FALSE, sizeof( gubMerkCanSeeThisTile ) );
|
||||||
{
|
|
||||||
sGridNo = tS->sGridNo + sXOffset + (MAXCOL * sYOffset);
|
//ðàçâåðòêà öèêëà. ïðè èçìåíåíèè WORLD_MAX íà äð.çíà÷. íåîáõîäèìî áóäåò ïîä÷èùàòü õâîñòû! èáî îïàñíûé êîä!!! ;)
|
||||||
if ( sGridNo <= 0 || sGridNo >= WORLD_MAX ) continue;
|
|
||||||
//usSightLimit = tS->GetMaxDistanceVisible(sGridNo, FALSE, CALC_FROM_WANTED_DIR);
|
|
||||||
if(gubMerkCanSeeThisTile[sGridNo]==0)
|
|
||||||
gubMerkCanSeeThisTile[sGridNo]=//SoldierToVirtualSoldierLineOfSightTest( tS, sGridNo, FALSE, ANIM_STAND, TRUE, usSightLimit );
|
|
||||||
SoldierToVirtualSoldierLineOfSightTest( tS, sGridNo, tS->pathing.bLevel,
|
|
||||||
ANIM_STAND, TRUE, CALC_FROM_WANTED_DIR);
|
|
||||||
|
|
||||||
}//fo
|
// WANNE: We had a custom user map (Tixa, J9), where the following loop caused an unhandled exception.
|
||||||
}//if
|
// The crash occurd at ~index 16000 when calling the method IsCorpseAtGridNo() ...
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
// I don't know what causes it ...
|
||||||
//uiEndTime = GetJA2Clock();
|
// Just try/catch (ugly, but works).
|
||||||
//ScreenMsg( 144,0, L"t=%d",uiEndTime - uiStartTime );
|
__try
|
||||||
//
|
{
|
||||||
}
|
for(UINT32 i=0; i<WORLD_MAX ;i+=4)
|
||||||
//ddd îïòèìèçàöèÿ äëÿ õîäà äðàíèêîâ**
|
{
|
||||||
|
gubWorldTileInLight[i] = InLightAtNight(i, gpWorldLevelData[ i ].sHeight);
|
||||||
|
gubIsCorpseThere[i] = IsCorpseAtGridNo( i, gpWorldLevelData[ i ].sHeight );
|
||||||
|
gubWorldTileInLight[i+1] = InLightAtNight(i+1, gpWorldLevelData[ i+1 ].sHeight);
|
||||||
|
gubIsCorpseThere[i+1] = IsCorpseAtGridNo( i+1, gpWorldLevelData[ i+1 ].sHeight );
|
||||||
|
gubWorldTileInLight[i+2] = InLightAtNight(i+2, gpWorldLevelData[ i+2 ].sHeight);
|
||||||
|
gubIsCorpseThere[i+2] = IsCorpseAtGridNo( i+2, gpWorldLevelData[ i+2 ].sHeight );
|
||||||
|
gubWorldTileInLight[i+3] = InLightAtNight(i+3, gpWorldLevelData[ i+3 ].sHeight);
|
||||||
|
gubIsCorpseThere[i+3] = IsCorpseAtGridNo( i+3, gpWorldLevelData[ i+3 ].sHeight );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
__except( EXCEPTION_EXECUTE_HANDLER )
|
||||||
|
{
|
||||||
|
// WANNE: Ignore, so the game can continue ...
|
||||||
|
}
|
||||||
|
|
||||||
|
INT32 tcnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID;
|
||||||
|
SOLDIERTYPE *tS;
|
||||||
|
|
||||||
|
INT16 sXOffset, sYOffset;
|
||||||
|
INT32 sGridNo;UINT16 usSightLimit=0;
|
||||||
|
|
||||||
|
for ( tS = MercPtrs[ tcnt ]; tcnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; tcnt++,tS++ )
|
||||||
|
if ( tS->stats.bLife >= OKLIFE && tS->sGridNo != NOWHERE && tS->bInSector )
|
||||||
|
{
|
||||||
|
//loop through all the gridnos that we are interested in
|
||||||
|
for (sYOffset = -30; sYOffset <= 30; sYOffset++)
|
||||||
|
for (sXOffset = -30; sXOffset <= 30; sXOffset++)
|
||||||
|
{
|
||||||
|
sGridNo = tS->sGridNo + sXOffset + (MAXCOL * sYOffset);
|
||||||
|
if ( sGridNo <= 0 || sGridNo >= WORLD_MAX )
|
||||||
|
continue;
|
||||||
|
//usSightLimit = tS->GetMaxDistanceVisible(sGridNo, FALSE, CALC_FROM_WANTED_DIR);
|
||||||
|
if(gubMerkCanSeeThisTile[sGridNo]==0)
|
||||||
|
gubMerkCanSeeThisTile[sGridNo]=//SoldierToVirtualSoldierLineOfSightTest( tS, sGridNo, FALSE, ANIM_STAND, TRUE, usSightLimit );
|
||||||
|
SoldierToVirtualSoldierLineOfSightTest( tS, sGridNo, tS->pathing.bLevel,
|
||||||
|
ANIM_STAND, TRUE, CALC_FROM_WANTED_DIR);
|
||||||
|
|
||||||
|
}//fo
|
||||||
|
}//if
|
||||||
|
}
|
||||||
|
//ddd îïòèìèçàöèÿ äëÿ õîäà äðàíèêîâ**
|
||||||
|
|
||||||
// End our turn!
|
// End our turn!
|
||||||
if (is_server || !is_client)
|
if (is_server || !is_client)
|
||||||
{
|
{
|
||||||
EndTurn( gbPlayerNum + 1 );
|
EndTurn( gbPlayerNum + 1 );
|
||||||
}
|
}
|
||||||
if(!is_server && is_client)
|
if(!is_server && is_client)
|
||||||
|
{
|
||||||
|
|
||||||
|
if (INTERRUPT_QUEUED)
|
||||||
{
|
{
|
||||||
|
EndTurn( gbPlayerNum + 1 );//is ending interrupt instead
|
||||||
if (INTERRUPT_QUEUED)
|
|
||||||
{
|
|
||||||
EndTurn( gbPlayerNum + 1 );//is ending interrupt instead
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
send_EndTurn( netbTeam+1 );//for sending next netbteam rather than next local team
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
send_EndTurn( netbTeam+1 );//for sending next netbteam rather than next local team
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return( GAME_SCREEN );
|
return( GAME_SCREEN );
|
||||||
|
|||||||
Reference in New Issue
Block a user