Another rollup patch.

- fixed manual moving
- quick hack to avoid division by zero when calculating game.state.remtime
- fixed some problems with sensors() on ncurses
- small translation fixes

diff --git a/po/ru.po b/po/ru.po
index e4d4a8b361198c7c19dd89b99f194263c6a8f7e3..5445d076be044b975f8d0bf877727079ee107019 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -2789,11 +2789,11 @@ msgstr "Отвечайте \"no\" если не знаете:"
 
 #: src/reports.c:482
 msgid "Time or arrival date? "
 
 #: src/reports.c:482
 msgid "Time or arrival date? "

-msgstr "Время прибытия?"
+msgstr "Время прибытия? "

 
 #: src/reports.c:489
 msgid "We'll never make it, sir."
 
 #: src/reports.c:489
 msgid "We'll never make it, sir."

-msgstr "Ни как не получится, сэр."
+msgstr "Никак не получится, сэр."

 
 #: src/reports.c:498
 msgid "Warp factor? "
 
 #: src/reports.c:498
 msgid "Warp factor? "

diff --git a/src/battle.c b/src/battle.c
index 71a8202a441f8a378d717bd1e05ead849302f0a5..78baae9eab970dbf4a127991fbf873c154c63937 100644 (file)
--- a/src/battle.c
+++ b/src/battle.c
@@ -792,7 +792,8 @@ void deadkl(coord w, feature type, coord mv)
     if ((game.state.remkl + game.state.remcom + game.state.nscrem)==0)
        return;
 
     if ((game.state.remkl + game.state.remcom + game.state.nscrem)==0)
        return;
 

-    game.state.remtime = game.state.remres/(game.state.remkl + 4*game.state.remcom);
+    game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+           game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;

 
     /* Remove enemy ship from arrays describing local conditions */
     if (is_scheduled(FCDBAS) && same(game.battle, game.quadrant) && type==IHC)
 
     /* Remove enemy ship from arrays describing local conditions */
     if (is_scheduled(FCDBAS) && same(game.battle, game.quadrant) && type==IHC)

diff --git a/src/events.c b/src/events.c
index f47d420241aef19fba60326d557d8056d068ceec..a35c690e4f61e735de9e18625959427fbd7f8d85 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -111,7 +111,8 @@ void events(void)
        game.state.date = datemin;
        /* Decrement Federation resources and recompute remaining time */
        game.state.remres -= (game.state.remkl+4*game.state.remcom)*xtime;
        game.state.date = datemin;
        /* Decrement Federation resources and recompute remaining time */
        game.state.remres -= (game.state.remkl+4*game.state.remcom)*xtime;

-       game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+       game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+               game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;

        if (game.state.remtime <=0) {
            finish(FDEPLETE);
            return;
        if (game.state.remtime <=0) {
            finish(FDEPLETE);
            return;


@@ -528,7 +529,8 @@ void events(void)
                newkling(++game.klhere);
 
            /* recompute time left */
                newkling(++game.klhere);
 
            /* recompute time left */

-           game.state.remtime = game.state.remres/(game.state.remkl+4*game.state.remcom);
+           game.state.remtime = game.state.remkl + game.state.remcom > 0 ?
+                   game.state.remres/(game.state.remkl + 4*game.state.remcom) : 99;

            /* report the disaster if we can */
            if (!damaged(DRADIO) || game.condition == docked)
            {
            /* report the disaster if we can */
            if (!damaged(DRADIO) || game.condition == docked)
            {

diff --git a/src/moving.c b/src/moving.c
index 0c44b9941801cac099b553c3fd5d5d969e32c8e4..f8965c2d05d2da94afaeb6407784ef23dedf1a7d 100644 (file)
--- a/src/moving.c
+++ b/src/moving.c
@@ -325,7 +325,7 @@ static void getcd(bool isprobe, int akey)
                prout(_("(Manual navigation assumed.)"));
            else
                prout(_("(Manual movement assumed.)"));
                prout(_("(Manual navigation assumed.)"));
            else
                prout(_("(Manual movement assumed.)"));

-           navmode = automatic;
+           navmode = manual;

            break;
        }
     }
            break;
        }
     }

diff --git a/src/planets.c b/src/planets.c
index 9441100fb8a2577d10f150615241c647f74b5c93..e8ead07638782af4eeeb5613ae1d83ccad115144 100644 (file)
--- a/src/planets.c
+++ b/src/planets.c
@@ -79,14 +79,16 @@ void sensor(void)
 /* examine planets in this quadrant */
 {
     if (damaged(DSRSENS)) {
 /* examine planets in this quadrant */
 {
     if (damaged(DSRSENS)) {

-       prout(_("Short range sensors damaged."));
+       if (game.options & OPTION_TTY)
+           prout(_("Short range sensors damaged."));

        return;
     }
        return;
     }

-    if (!is_valid(game.plnet) && (game.options & OPTION_TTY)) {
-       prout(_("Spock- \"No planet in this quadrant, Captain.\""));
+    if (!is_valid(game.plnet)) {
+       if (game.options & OPTION_TTY)
+           prout(_("Spock- \"No planet in this quadrant, Captain.\""));

        return;
     }
        return;
     }

-    if (is_valid(game.plnet) && (game.state.planets[game.iplnet].known == unknown)) {
+    if (game.state.planets[game.iplnet].known == unknown) {

        prout(_("Spock-  \"Sensor scan for %s-"), cramlc(quadrant, game.quadrant));
        skip(1);
        prout(_("         Planet at %s is of class %s."),
        prout(_("Spock-  \"Sensor scan for %s-"), cramlc(quadrant, game.quadrant));
        skip(1);
        prout(_("         Planet at %s is of class %s."),