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 fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/TeamTurns.cpp
+5 -5
View File
@@ -590,7 +590,7 @@ void DisplayHiddenTurnbased( SOLDIERTYPE * pActingSoldier )
//JA2Gold: use function to make sure flags turned off everywhere else
//pActingSoldier->uiStatusFlags |= SOLDIER_UNDERAICONTROL;
SetSoldierAsUnderAiControl( pActingSoldier );
DebugAI( (STR)String( "Giving AI control to %d", pActingSoldier->ubID ) );
DebugAI( String( "Giving AI control to %d", pActingSoldier->ubID ) );
pActingSoldier->fTurnInProgress = TRUE;
gTacticalStatus.uiTimeSinceMercAIStart = GetJA2Clock();
@@ -675,7 +675,7 @@ void StartInterrupt( void )
if (pSoldier->bTeam == OUR_TEAM)
{
// start interrupts for everyone on our side at once
INT16 sTemp[ 255 ];
CHAR16 sTemp[ 255 ];
UINT8 ubInterrupters = 0;
INT32 iSquad, iCounter;
@@ -716,7 +716,7 @@ void StartInterrupt( void )
// flush... display string, then clear it (we could have 20 names!)
// add comma to end, we know we have another person after this...
wcscat( sTemp, L", " );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp );
wcscpy( sTemp, L"" );
ubInterrupters = 1;
}
@@ -730,7 +730,7 @@ void StartInterrupt( void )
}
}
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, (STR16) sTemp );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sTemp );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("INTERRUPT: starting interrupt for %d", ubFirstInterrupter ) );
// gusSelectedSoldier should become the topmost guy on the interrupt list
@@ -1717,7 +1717,7 @@ void AddToIntList( UINT8 ubID, BOOLEAN fGainControl, BOOLEAN fCommunicate )
// turn off AI control flag if they lost control
if (Menptr[ubID].uiStatusFlags & SOLDIER_UNDERAICONTROL)
{
DebugAI( (STR)String( "Taking away AI control from %d", ubID ) );
DebugAI( String( "Taking away AI control from %d", ubID ) );
Menptr[ubID].uiStatusFlags &= (~SOLDIER_UNDERAICONTROL);
}
}