Get rid of some macros that block mechanical translation.

[super-star-trek.git] / src / ai.c

diff --git a/src/ai.c b/src/ai.c
index 7f0112d5f957912ad9820a1bdb1e71d2a2838d1a..e0bfb08ad50cfce872446ef883a982a1faa579e1 100644 (file)
--- a/src/ai.c
+++ b/src/ai.c
@@ -360,7 +360,7 @@ static bool movescom(coord iq, bool avoid)
        if (same(game.state.planets[i].w, game.state.kscmdr) &&
            game.state.planets[i].crystals == present) {
            /* destroy the planet */
-           DESTROY(&game.state.planets[i]);
+           game.state.planets[i].pclass = destroyed;
            game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET;
            if (!damaged(DRADIO) || game.condition == docked) {
                pause_game(true);
@@ -389,7 +389,7 @@ void supercommander(void)
        prout("== SUPERCOMMANDER");
 
     /* Decide on being active or passive */
-    avoid = ((NKILLC+NKILLK)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) ||
+    avoid = ((game.incom - game.state.remcom + game.inkling - game.state.remkl)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) ||
            (game.state.date-game.indate) < 3.0);
     if (!game.iscate && avoid) {
        /* compute move away from Enterprise */