few assorted adjustments and a fix for #8883

diff --git a/po/ru.po b/po/ru.po
index 312c9710465e5b437f27116bbf8fc3b74fd9ace0..6943defe7faa36b81688a58703a6dba7afc385c9 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sst 2.0\n"
 "Report-Msgid-Bugs-To: stsp\n"
 msgstr ""
 "Project-Id-Version: sst 2.0\n"
 "Report-Msgid-Bugs-To: stsp\n"

-"POT-Creation-Date: 2006-09-22 20:54+0400\n"
+"POT-Creation-Date: 2006-09-25 10:36+0400\n"

 "PO-Revision-Date: 2006-09-15 11:01+0400\n"
 "Last-Translator: Stas Sergeev <stsp@aknet.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2006-09-15 11:01+0400\n"
 "Last-Translator: Stas Sergeev <stsp@aknet.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -567,13 +567,12 @@ msgid "Very small hit on "
 msgstr "Очень слабый удар по "
 
 #: src/battle.c:1329
 msgstr "Очень слабый удар по "
 
 #: src/battle.c:1329

-#, fuzzy, c-format

 msgid "***Mr. Spock-  \"Captain, the vessel at %s"
 msgid "***Mr. Spock-  \"Captain, the vessel at %s"

-msgstr "***Ð\9cиÑ\81Ñ\82еÑ\80 Спок- \"Ð\9aапиÑ\82ан, коÑ\80аблÑ\8c на "
+msgstr "***Ð\9cиÑ\81Ñ\82еÑ\80 Спок- \"Ð\9aапиÑ\82ан, поÑ\81Ñ\83дина в %s "

 
 #: src/battle.c:1331
 msgid "   has just lost its firepower.\""
 
 #: src/battle.c:1331
 msgid "   has just lost its firepower.\""

-msgstr "   потерял боеспособность.\""
+msgstr "   потеряла боеспособность.\""

 
 #: src/events.c:141
 msgid "Lt. Uhura- \"Captain, the sub-space radio is working and"
 
 #: src/events.c:141
 msgid "Lt. Uhura- \"Captain, the sub-space radio is working and"


@@ -716,9 +715,9 @@ msgid "     Supernova in %s; caution advised."
 msgstr "     Взрыв сверхновой в %s; соблюдайте осторожность."
 
 #: src/events.c:853
 msgstr "     Взрыв сверхновой в %s; соблюдайте осторожность."
 
 #: src/events.c:853

-#, fuzzy, c-format
+#, c-format

 msgid "***Incipient supernova detected at %s"
 msgid "***Incipient supernova detected at %s"

-msgstr "***Зарегистрировано появление сверхновой в "
+msgstr "***Зарегистрирован взрыв сверхновой в %s"

 
 #: src/events.c:855
 msgid "Emergency override attempts t"
 
 #: src/events.c:855
 msgid "Emergency override attempts t"


@@ -2588,7 +2587,7 @@ msgstr "Спок- \"Я обновил звёздную карту по запи
 
 #: src/reports.c:207
 msgid "       STAR CHART FOR THE KNOWN GALAXY"
 
 #: src/reports.c:207
 msgid "       STAR CHART FOR THE KNOWN GALAXY"

-msgstr "       ЗВЁЗДНАЯ КАРТА ИССЛЕДОВАННЫХ УЧАСТКОВ"
+msgstr "     ЗВЁЗДНАЯ КАРТА ИССЛЕДОВАННЫХ УЧАСТКОВ"

 
 #: src/reports.c:209
 #, c-format
 
 #: src/reports.c:209
 #, c-format


@@ -2723,11 +2722,11 @@ msgstr "  [Используются сенсоры Базы]"
 
 #: src/reports.c:386
 msgid "     Short-range scan"
 
 #: src/reports.c:386
 msgid "     Short-range scan"

-msgstr "     Ближний обзор"
+msgstr "       Ближний обзор"

 
 #: src/reports.c:412
 msgid "COMPUTER DAMAGED, USE A POCKET CALCULATOR."
 
 #: src/reports.c:412
 msgid "COMPUTER DAMAGED, USE A POCKET CALCULATOR."

-msgstr "Ð\9aÐ\9eÐ\9cÐ\9fЬЬЮТÐ\95Ð  СÐ\9bÐ\9eÐ\9cÐ\90Ð\9d, Ð\92Ð\9eСÐ\9fÐ\9eÐ\9bЬÐ\97УÐ\99ТÐ\95СЬ Ð\9aÐ\90Ð\9bЬÐ\9aУÐ\9bЯТÐ\9eÐ Ð\9eÐ\9c."
+msgstr "КОМПЬЮТЕР СЛОМАН, ВОСПОЛЬЗУЙТЕСЬ КАЛЬКУЛЯТОРОМ."

 
 #: src/reports.c:419
 msgid "Destination quadrant and/or sector? "
 
 #: src/reports.c:419
 msgid "Destination quadrant and/or sector? "


@@ -3218,90 +3217,90 @@ msgstr "Спок- \"Капитан, я нашёл кое-какую информ
 msgid "WARNING--Saved games produce no plaques!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ--Сохранённые игры не дают грамоты!"
 
 msgid "WARNING--Saved games produce no plaques!"
 msgstr "ПРЕДУПРЕЖДЕНИЕ--Сохранённые игры не дают грамоты!"
 

-#: src/sst.c:664
+#: src/sst.c:666

 msgid "Do you want your score recorded?"
 msgstr "Хотите записать свой счёт? "
 
 msgid "Do you want your score recorded?"
 msgstr "Хотите записать свой счёт? "
 

-#: src/sst.c:670
+#: src/sst.c:672

 msgid "Do you want to play again? "
 msgstr "Хотите сыграть снова? "
 
 msgid "Do you want to play again? "
 msgstr "Хотите сыграть снова? "
 

-#: src/sst.c:674
+#: src/sst.c:676

 msgid "May the Great Bird of the Galaxy roost upon your home planet."
 msgstr "И пусть Великая Птица Галактики нагадит на твою планету."
 
 msgid "May the Great Bird of the Galaxy roost upon your home planet."
 msgstr "И пусть Великая Птица Галактики нагадит на твою планету."
 

-#: src/sst.c:686
+#: src/sst.c:688

 msgid "Romulan"
 msgstr "Ромулан"
 
 msgid "Romulan"
 msgstr "Ромулан"
 

-#: src/sst.c:687
+#: src/sst.c:689

 msgid "Klingon"
 msgstr "Клингон"
 
 msgid "Klingon"
 msgstr "Клингон"
 

-#: src/sst.c:688
+#: src/sst.c:690

 msgid "Commander"
 msgstr "Командир"
 
 msgid "Commander"
 msgstr "Командир"
 

-#: src/sst.c:689
+#: src/sst.c:691

 msgid "Super-commander"
 msgstr "Глав-ком"
 
 msgid "Super-commander"
 msgstr "Глав-ком"
 

-#: src/sst.c:690
+#: src/sst.c:692

 msgid "Star"
 msgstr "Звезда"
 
 msgid "Star"
 msgstr "Звезда"
 

-#: src/sst.c:691
+#: src/sst.c:693

 msgid "Planet"
 msgstr "Планета"
 
 msgid "Planet"
 msgstr "Планета"
 

-#: src/sst.c:692
+#: src/sst.c:694

 msgid "Starbase"
 msgstr "База"
 
 msgid "Starbase"
 msgstr "База"
 

-#: src/sst.c:693
+#: src/sst.c:695

 msgid "Black hole"
 msgstr "Чёрная дыра"
 
 msgid "Black hole"
 msgstr "Чёрная дыра"
 

-#: src/sst.c:694
+#: src/sst.c:696

 msgid "Tholian"
 msgstr "Толиан"
 
 msgid "Tholian"
 msgstr "Толиан"
 

-#: src/sst.c:695
+#: src/sst.c:697

 msgid "Tholian web"
 msgstr "Толианская сеть"
 
 msgid "Tholian web"
 msgstr "Толианская сеть"
 

-#: src/sst.c:696
+#: src/sst.c:698

 msgid "Stranger"
 msgstr "Странник"
 
 msgid "Stranger"
 msgstr "Странник"
 

-#: src/sst.c:697
+#: src/sst.c:699

 msgid "Inhabited World"
 msgstr "Обитаемый Мир"
 
 msgid "Inhabited World"
 msgstr "Обитаемый Мир"
 

-#: src/sst.c:708
+#: src/sst.c:710

 msgid "Quadrant "
 msgstr "Квадрант "
 
 msgid "Quadrant "
 msgstr "Квадрант "
 

-#: src/sst.c:709
+#: src/sst.c:711

 msgid "Sector "
 msgstr "Сектор "
 
 msgid "Sector "
 msgstr "Сектор "
 

-#: src/sst.c:719
+#: src/sst.c:721

 msgid " at "
 msgstr " в "
 
 msgid " at "
 msgstr " в "
 

-#: src/sst.c:728
+#: src/sst.c:730

 msgid "Enterprise"
 msgstr "Энтерпрайз"
 
 msgid "Enterprise"
 msgstr "Энтерпрайз"
 

-#: src/sst.c:729
+#: src/sst.c:731

 msgid "Faerie Queene"
 msgstr "Волшебная Королева"
 
 msgid "Faerie Queene"
 msgstr "Волшебная Королева"
 

-#: src/sst.c:838
+#: src/sst.c:840

 msgid "Please answer with \"y\" or \"n\": "
 msgstr "Пожалуйста отвечайте Да (\"y\") или Нет (\"n\"): "
 
 msgid "Please answer with \"y\" or \"n\": "
 msgstr "Пожалуйста отвечайте Да (\"y\") или Нет (\"n\"): "
 

-#: src/sst.c:847
+#: src/sst.c:849

 msgid "Beg your pardon, Captain?"
 msgstr "Прошу прощения, Капитан?"
 msgid "Beg your pardon, Captain?"
 msgstr "Прошу прощения, Капитан?"

diff --git a/src/io.c b/src/io.c
index 134fdef4775fb18c7cf94441da12802369f785bd..65edfdf59d07c2c0721eacba9a91f564f49a0046 100644 (file)
--- a/src/io.c
+++ b/src/io.c
@@ -47,13 +47,13 @@ void iostart(void)
        char *ln_env = getenv("LINES");
        rows = ln_env ? atoi(ln_env) : 25;
     } else {
        char *ln_env = getenv("LINES");
        rows = ln_env ? atoi(ln_env) : 25;
     } else {

-       (void)initscr();
+       initscr();

 #ifdef KEY_MIN
        keypad(stdscr, TRUE);
 #endif /* KEY_MIN */
 #ifdef KEY_MIN
        keypad(stdscr, TRUE);
 #endif /* KEY_MIN */

-       (void)saveterm();
-       (void)nonl();
-       (void)cbreak();
+       saveterm();
+       nonl();
+       cbreak();

 #ifdef A_COLOR
        {
            start_color();
 #ifdef A_COLOR
        {
            start_color();


@@ -67,7 +67,7 @@ void iostart(void)
            init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
        }
 #endif /* A_COLOR */
            init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
        }
 #endif /* A_COLOR */

-       //(void)noecho();
+       //noecho();

        fullscreen_window = stdscr;
        srscan_window     = newwin(12, 25, 0,       0);
        report_window     = newwin(11, 0,  1,       25);
        fullscreen_window = stdscr;
        srscan_window     = newwin(12, 25, 0,       0);
        report_window     = newwin(11, 0,  1,       25);

diff --git a/src/reports.c b/src/reports.c
index 5c9289b5f0236a97da98531544e1eda5e77cd919..9d3ddd8a316b6d322da473b82918c6baeab79924 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -26,8 +26,8 @@ void attakreport(bool curt)
            proutn(_("Base in %i - %i attacked by C. Alive until %.1f"), game.battle.x, game.battle.y, scheduled(FCDBAS));
         if (game.isatb)
            proutn(_("Base in %i - %i attacked by S. Alive until %.1f"), game.state.kscmdr.x, game.state.kscmdr.y, scheduled(FSCDBAS));
            proutn(_("Base in %i - %i attacked by C. Alive until %.1f"), game.battle.x, game.battle.y, scheduled(FCDBAS));
         if (game.isatb)
            proutn(_("Base in %i - %i attacked by S. Alive until %.1f"), game.state.kscmdr.x, game.state.kscmdr.y, scheduled(FSCDBAS));

+       clreol();

     }
     }

-    clreol();

 }
        
 
 }
        
 

diff --git a/src/sst.c b/src/sst.c
index c51dc27835fdd853742f6419638befe8087208d2..d0d5d05ec97033fbf774c790f97cc08032f2f34f 100644 (file)
--- a/src/sst.c
+++ b/src/sst.c
@@ -634,11 +634,12 @@ int main(int argc, char **argv)
     }
     /* where to save the input in case of bugs */
     logfp = fopen("/usr/tmp/sst-input.log", "w");
     }
     /* where to save the input in case of bugs */
     logfp = fopen("/usr/tmp/sst-input.log", "w");

-    setlinebuf(logfp);
-    fprintf(logfp, "seed %d\n", seed);
+    if (logfp) {
+       setlinebuf(logfp);
+       fprintf(logfp, "seed %d\n", seed);
+    }

     srand(seed);
 
     srand(seed);
 

-    srand(seed);

     iostart();
 
     line[0] = '\0';
     iostart();
 
     line[0] = '\0';

diff --git a/src/sst.py b/src/sst.py
index 4f7b6e4d315796e8be7887dbe0a216684caaf962..8e3842f045b30132845080f2486ee6301c5b8593 100644 (file)
--- a/src/sst.py
+++ b/src/sst.py
@@ -503,7 +503,7 @@ def movebaddy(ship):
             if ship.distance() < dist1:
                 prout(" advances to sector %s" % ship.location)
             else:
             if ship.distance() < dist1:
                 prout(" advances to sector %s" % ship.location)
             else:

-                proutn(" retreats to sector %s" % ship.location)
+                prout(" retreats to sector %s" % ship.location)

         ship.sectormove(next)
 
 def movcom(): 
         ship.sectormove(next)
 
 def movcom(): 

diff --git a/src/sstlinux.h b/src/sstlinux.h
index 1080f9691346a2c3c53adc8349ee315eaff6ffc7..c241f12d6b781df0fd292a6c62bf5a3c15ab262f 100644 (file)
--- a/src/sstlinux.h
+++ b/src/sstlinux.h
@@ -5,6 +5,5 @@ void sound(unsigned int);
 void nosound(void);
 
 #define delay(x) usleep(x*1000)
 void nosound(void);
 
 #define delay(x) usleep(x*1000)

-#define randomize() srand((unsigned)time(NULL))

 
 #endif
 
 #endif