Fixes (by The_Bob):

- Fixed never ending interrupt bug (cats/bugs got interrupt when out of breath)
- Added condition to interrupt code for minimal breath left to get interrupts
- Tweaked timer control code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2017-04-14 19:03:55 +00:00
parent d7f91064f0
commit 0c521e2623
4 changed files with 15 additions and 13 deletions
+3 -1
View File
@@ -22006,8 +22006,10 @@ BOOLEAN ResolvePendingInterrupt( SOLDIERTYPE * pSoldier, UINT8 ubInterruptType )
pInterrupter = MercPtrs[uCnt];
if ( pInterrupter == NULL )
continue; // not valid
if ( pInterrupter->stats.bLife < OKLIFE || pInterrupter->bCollapsed || !pInterrupter->bActive || !pInterrupter->bInSector || pInterrupter->bActionPoints < 4 )
if (pInterrupter->stats.bLife < OKLIFE || pInterrupter->bCollapsed || !pInterrupter->bActive || !pInterrupter->bInSector || pInterrupter->bActionPoints < 4)
continue; // not active
if (pInterrupter->bBreath < OKBREATH && pInterrupter->bTeam != OUR_TEAM)
continue; // BOB: prevent NPCs from getting interrupts when out of breath
if ( pSoldier->bTeam == pInterrupter->bTeam )
continue; // same team
if ( pSoldier->bSide == pInterrupter->bSide )