adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #319 part 3 fix (fleeing yehat collision after menu)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1262 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2003-10-01 16:11:42 +00:00
parent 406e666094
commit 4b4cf5f373
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/ipdisp.c
+9 -2
View File
@@ -144,14 +144,21 @@ ip_group_preprocess (PELEMENT ElementPtr)
<< FACING_SHIFT; << FACING_SHIFT;
} }
if (!(task & REFORM_GROUP) if (!(task & REFORM_GROUP))
&& (task & ~(IGNORE_FLAGSHIP | REFORM_GROUP)) != FLEE) {
if ((task & ~(IGNORE_FLAGSHIP | REFORM_GROUP)) != FLEE)
{ {
if (EPtr->state_flags & BAD_GUY) if (EPtr->state_flags & BAD_GUY)
EPtr->state_flags &= ~GOOD_GUY; EPtr->state_flags &= ~GOOD_GUY;
else else
EPtr->state_flags |= BAD_GUY; EPtr->state_flags |= BAD_GUY;
} }
else if (!(task & IGNORE_FLAGSHIP)
&& !(EPtr->state_flags & (GOOD_GUY | BAD_GUY)))
{ // fleeing yehat ship collisions after menu fix
EPtr->state_flags |= BAD_GUY;
}
}
target_loc = GET_GROUP_DEST (StarShipPtr); target_loc = GET_GROUP_DEST (StarShipPtr);
if (!(task & (IGNORE_FLAGSHIP | REFORM_GROUP))) if (!(task & (IGNORE_FLAGSHIP | REFORM_GROUP)))