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

- bugfix mp: fixed up coop

Browse Source 
- bugfix mp: fixed bobby rays code my end

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-05-13 18:49:02 +00:00
parent 10e518110a
commit bf99b6d9e6
13 changed files with 189 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+38 -8
View File
@@ -1200,14 +1200,14 @@ BOOLEAN ExecuteOverhead( )
}
//hayden - holt at scheduled grid
if (is_networked)
{
if(pSoldier->sGridNo==pSoldier->sScheduledStop)
{
pSoldier->HaultSoldierFromSighting( 1 );
pSoldier->sScheduledStop=NULL;
}
}
//if (is_networked)
//{
// if(pSoldier->sGridNo==pSoldier->sScheduledStop)
// {
// pSoldier->HaultSoldierFromSighting( 1 );
// pSoldier->sScheduledStop=NULL;
// }
//}
if ( !( gAnimControl[ pSoldier->usAnimState ].uiFlags & ANIM_SPECIALMOVE ) )
{
@@ -5929,6 +5929,21 @@ BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
BOOLEAN fSayQuote = FALSE;
BOOLEAN fWeSawSomeoneRecently = FALSE, fSomeoneSawSomeoneRecently = FALSE;
if(is_server && check_status())
{
if(NumActiveAndConsciousTeamMembers( 0 ) ==0)
{
//ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"still some left");
}
return(FALSE);
}
// We can only check for end of combat if in combat mode
if ( ! ( gTacticalStatus.uiFlags & INCOMBAT ) )
{
@@ -5953,6 +5968,8 @@ BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
return( TRUE );
}
fWeSeeNoOne = WeSeeNoOne();
fNobodyAlerted = NobodyAlerted();
if ( fWeSeeNoOne && fNobodyAlerted )
@@ -6091,6 +6108,7 @@ void DeathNoMessageTimerCallback( void )
ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[40] );
gTacticalStatus.uiFlags |= SHOW_ALL_MERCS;//hayden
ScreenMsg( FONT_YELLOW, MSG_CHAT, MPClientMessage[41] );
teamwiped();
}
}
@@ -6129,6 +6147,17 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
}
}
if(is_server && check_status())
{
if(NumActiveAndConsciousTeamMembers( 0 ) ==0)
{
//ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"still some left");
}
return(FALSE);
}
// ATE: If attack busy count.. get out...
if ( (gTacticalStatus.ubAttackBusyCount > 0 ) )
{
@@ -8160,6 +8189,7 @@ void EndBattleWithUnconsciousGuysCallback( UINT8 bExitValue )
ScreenMsg( FONT_LTGREEN, MSG_CHAT, MPClientMessage[40] );
gTacticalStatus.uiFlags |= SHOW_ALL_MERCS;//hayden
ScreenMsg( FONT_YELLOW, MSG_CHAT, MPClientMessage[41] );
teamwiped();
}
}