Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't override defense ship AI with policeInterceptAI if the defense_ship_role or defense_ship is specified

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@353 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Giles Williams 2006-03-21 21:58:58 +00:00
parent cb551bfa8b
commit b0b4b6f480
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/StationEntity.m
View File

@ -1388,11 +1388,13 @@ NSDictionary* instructions(int station_id, Vector coords, float speed, float ran
{
// NSLog(@"DEBUG Defense ship key found: %@", [shipinfoDictionary objectForKey:@"defense_ship"]);
defense_ship_key = (NSString*)[shipinfoDictionary objectForKey:@"defense_ship"];
defense_ship_ai = nil;
}
if ([shipinfoDictionary objectForKey:@"defense_ship_role"])
{
// NSLog(@"DEBUG Defense ship role key found: %@", [shipinfoDictionary objectForKey:@"defense_ship_role"]);
defense_ship_role_key = (NSString*)[shipinfoDictionary objectForKey:@"defense_ship_role"];
defense_ship_ai = nil;
}
// NSLog(@"DEBUG Launching defense ship to intercept %@",[(ShipEntity *)[universe entityForUniversalID:defense_target] name]);
@ -1415,7 +1417,9 @@ NSDictionary* instructions(int station_id, Vector coords, float speed, float ran
police_launched++;
[defense_ship setOwner: self];
[defense_ship setGroup_id:universal_id]; // who's your Daddy
if (defense_ship_ai)
[[defense_ship getAI] setStateMachine:defense_ship_ai];
[defense_ship addTarget:[universe entityForUniversalID:defense_target]];