added credit check to MERC purchases

fixed appearance of enemy MERC NPC's to show stats when targeted
fixed realtime
added check to only allow AI during game mode coop

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
haydent
2008-05-15 14:41:47 +00:00
parent 36be370bca
commit a04768e6a6
5 changed files with 37 additions and 28 deletions
+5 -17
View File
@@ -5932,16 +5932,10 @@ BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
if(is_server && check_status())
{
if(NumActiveAndConsciousTeamMembers( 0 ) ==0)
{
//ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"still some left");
}
return(FALSE);
}
//if(is_server && check_status())
//{
// return(FALSE);
//}
// We can only check for end of combat if in combat mode
@@ -6149,13 +6143,7 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
if(is_server && check_status())
{
if(NumActiveAndConsciousTeamMembers( 0 ) ==0)
{
//ScreenMsg( FONT_LTGREEN, MSG_CHAT, L"still some left");
}
return(FALSE);
return(FALSE);
}
// ATE: If attack busy count.. get out...