1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bug fix: invisible enemies

Browse Source 
- bug fix: manual reload for two weapons
- bug fix: barrel extender falls off while none is attached


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2006-07-31 19:53:58 +00:00
parent bba67c2082
commit 7a9ea3dbe4
6 changed files with 106 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+30 -29
View File
@@ -1658,9 +1658,9 @@ BOOLEAN ExecuteOverhead( )
if ( ( GetJA2Clock( ) - guiWaitingForAllMercsToExitTimer ) > 2500 )
{
// OK, set num waiting to 0
#ifdef JA2BETAVERSION
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_DEBUG, L"Waiting too long for Mercs to exit...forcing entry." );
#endif
#ifdef JA2BETAVERSION
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_DEBUG, L"Waiting too long for Mercs to exit...forcing entry." );
#endif
gbNumMercsUntilWaitingOver = 0;
// Reset all waitng codes
@@ -1674,6 +1674,7 @@ BOOLEAN ExecuteOverhead( )
}
}
}
if ( gbNumMercsUntilWaitingOver == 0 )
{
@@ -1684,36 +1685,36 @@ BOOLEAN ExecuteOverhead( )
// OK cheif, do something here....
switch( gubWaitingForAllMercsToExitCode )
{
case WAIT_FOR_MERCS_TO_WALKOFF_SCREEN:
case WAIT_FOR_MERCS_TO_WALKOFF_SCREEN:
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
AllMercsHaveWalkedOffSector( );
break;
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
AllMercsHaveWalkedOffSector( );
break;
case WAIT_FOR_MERCS_TO_WALKON_SCREEN:
case WAIT_FOR_MERCS_TO_WALKON_SCREEN:
// OK, unset UI
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
break;
// OK, unset UI
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
break;
case WAIT_FOR_MERCS_TO_WALK_TO_GRIDNO:
case WAIT_FOR_MERCS_TO_WALK_TO_GRIDNO:
// OK, unset UI
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
AllMercsWalkedToExitGrid( );
break;
// OK, unset UI
if ( ( gTacticalStatus.ubCurrentTeam == gbPlayerNum ) )
{
guiPendingOverrideEvent = LU_ENDUILOCK;
HandleTacticalUI( );
}
AllMercsWalkedToExitGrid( );
break;
}
@@ -1723,8 +1724,8 @@ BOOLEAN ExecuteOverhead( )
gubWaitingForAllMercsToExitCode = 0;
}
}
}
// reset these AI-related global variables to 0 to ensure they don't interfere with the UI
gubNPCAPBudget = 0;
gubNPCDistLimit = 0;