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

- Fixed compiler error on macs.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4915 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Eric Walch 2012-05-08 07:54:13 +00:00
parent 2bf2d09243
commit 6486df01b7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Resources/AIs/stationAI.plist
View File

@ -1,8 +1,12 @@
{ {
GLOBAL =
{
ENTER = ("setStateTo: IDLE");
};
"DEFENSE_MODE" = "DEFENSE_MODE" =
{ {
ENTER = (checkTargetLegalStatus); ENTER = (checkTargetLegalStatus);
ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel); ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel, groupAttackTarget);
"RED_ALERT" = (launchDefenseShip); "RED_ALERT" = (launchDefenseShip);
"YELLOW_ALERT" = ("setStateTo: IDLE"); "YELLOW_ALERT" = ("setStateTo: IDLE");
"GREEN_ALERT" = ("setStateTo: CHECK_FOR_DEBRIS"); "GREEN_ALERT" = ("setStateTo: CHECK_FOR_DEBRIS");
@ -10,7 +14,7 @@
"TARGET_OFFENDER" = (increaseAlertLevel); "TARGET_OFFENDER" = (increaseAlertLevel);
"TARGET_FUGITIVE" = (increaseAlertLevel); "TARGET_FUGITIVE" = (increaseAlertLevel);
"ENERGY_FULL" = ("pauseAI: 20.0", "setStateTo: IDLE"); "ENERGY_FULL" = ("pauseAI: 20.0", "setStateTo: IDLE");
"OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel); "OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel, groupAttackTarget);
"TARGET_DESTROYED" = ("pauseAI: 20.0", "setStateTo: IDLE"); "TARGET_DESTROYED" = ("pauseAI: 20.0", "setStateTo: IDLE");
"TARGET_LOST" = ("pauseAI: 20.0", "setStateTo: IDLE"); "TARGET_LOST" = ("pauseAI: 20.0", "setStateTo: IDLE");
"NO_TARGET" = ("pauseAI: 20.0", "setStateTo: IDLE"); "NO_TARGET" = ("pauseAI: 20.0", "setStateTo: IDLE");
@ -18,20 +22,16 @@
"CHECK_FOR_DEBRIS" = "CHECK_FOR_DEBRIS" =
{ {
ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel, "setStateTo: DEFENSE_MODE"); ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel, "setStateTo: DEFENSE_MODE");
"OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel); "OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel, groupAttackTarget);
"INCOMING_MISSILE" = (fireECM, increaseAlertLevel); "INCOMING_MISSILE" = (fireECM, increaseAlertLevel);
"TARGET_FOUND" = (launchScavenger, "setStateTo: IDLE"); "TARGET_FOUND" = (launchScavenger, "setStateTo: IDLE");
"NOTHING_FOUND" = ("setStateTo: IDLE", "pauseAI: 20.0"); "NOTHING_FOUND" = ("setStateTo: IDLE", "pauseAI: 20.0");
UPDATE = (scanForLoot, "pauseAI: 10.0"); UPDATE = (scanForLoot, "pauseAI: 10.0");
}; };
GLOBAL =
{
ENTER = ("setStateTo: IDLE");
};
IDLE = IDLE =
{ {
ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel, "setStateTo: DEFENSE_MODE"); ATTACKED = (setTargetToPrimaryAggressor, increaseAlertLevel, "setStateTo: DEFENSE_MODE");
"OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel); "OFFENCE_COMMITTED" = (setTargetToFoundTarget, "markTargetForOffence: 15", launchDefenseShip, increaseAlertLevel, groupAttackTarget);
"INCOMING_MISSILE" = (fireECM, increaseAlertLevel); "INCOMING_MISSILE" = (fireECM, increaseAlertLevel);
UPDATE = (decreaseAlertLevel, "setStateTo: CHECK_FOR_DEBRIS"); UPDATE = (decreaseAlertLevel, "setStateTo: CHECK_FOR_DEBRIS");
}; };

2
src/Core/Entities/PlayerEntity.m
View File

@ -4509,7 +4509,7 @@ static GLfloat sBaseMass = 0.0;
} }
- (void) setBounty:(int)amount withReason:(OOLegalStatusReason)reason - (void) setBounty:(OOCreditsQuantity)amount withReason:(OOLegalStatusReason)reason
{ {
JSContext *context = OOJSAcquireContext(); JSContext *context = OOJSAcquireContext();