From ce3eeadeeebd4235ec50ddb2eb7c3833ad747670 Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 7 May 2016 10:40:30 +0100 Subject: [PATCH] CAP_HELPLESS -> CAP_DISABLED --- data/missions/aster/04 - aster assault.json | 2 +- src/battle/capitalShips.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/missions/aster/04 - aster assault.json b/data/missions/aster/04 - aster assault.json index 01d2483..3afb646 100644 --- a/data/missions/aster/04 - aster assault.json +++ b/data/missions/aster/04 - aster assault.json @@ -220,7 +220,7 @@ ] }, { - "function" : "CAP_HELPLESS HMS 121-008", + "function" : "CAP_DISABLED HMS 121-008", "lines" : [ "WAIT 1", "MSG_BOX Dodds;Brings back memories, doesn't it?", diff --git a/src/battle/capitalShips.c b/src/battle/capitalShips.c index 21817ef..6ff0c5a 100644 --- a/src/battle/capitalShips.c +++ b/src/battle/capitalShips.c @@ -97,7 +97,7 @@ void doCapitalShip(void) battle.missionTarget = NULL; } - if (self->side == SIDE_ALLIES) + if (self->side != player->side) { battle.stats[STAT_CAPITAL_SHIPS_LOST]++; @@ -381,7 +381,7 @@ static void disable(void) { Entity *e; - runScriptFunction("CAP_HELPLESS %s", self->owner->name); + runScriptFunction("CAP_DISABLED %s", self->owner->name); for (e = battle.entityHead.next ; e != NULL ; e = e->next) {