X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fio.c;h=5d4ea9a13154752c0ed904fc55f3116ee41fb936;hp=adbbca080a477ff59e274a17a24aab37e2fa64b8;hb=fd5a1ba781a0c37fa6181aa8e856d77d321df7a5;hpb=e535e2ef833a03ec84d0f002d684c07ddde893f1

diff --git a/src/io.c b/src/io.c
index adbbca0..5d4ea9a 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,16 +1,19 @@
 #include <stdio.h>
 #include <unistd.h>
-#include <curses.h>
-#include <signal.h>
-#include <ctype.h>
-#include <stdarg.h>
 
+#include "config.h"
 #include "sst.h"
 #include "sstlinux.h"
 
 static int rows, linecount;	/* for paging */
 
 WINDOW *curwnd;
+WINDOW *fullscreen_window;
+WINDOW *srscan_window;
+WINDOW *report_window;
+WINDOW *lrscan_window;
+WINDOW *message_window;
+WINDOW *prompt_window;
 
 static void outro(void)
 /* wrap up, either normally or due to signal */
@@ -24,17 +27,24 @@ static void outro(void)
 	(void)endwin();
 	putchar('\n');
     }
+    if (logfp)
+	fclose(logfp);
 }
 
 void iostart(void) 
 {
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+    gettext("");
+
+    if (atexit(outro)){
+	fprintf(stderr,"Unable to register outro(), exiting...\n");
+	exit(1);
+    }
     if (!(game.options & OPTION_CURSES)) {
 	rows = atoi(getenv("LINES"));
     } else {
-	if (atexit(outro)){
-	    fprintf(stderr,"Unable to register outro(), exiting...\n");
-	    exit(1);
-	}
 	(void)initscr();
 #ifdef KEY_MIN
 	keypad(stdscr, TRUE);
@@ -81,13 +91,13 @@ void pause_game(int i)
     char *prompt;
     char buf[BUFSIZ];
     if (i==1) {
-	if (skill > SKILL_FAIR)
+	if (game.skill > SKILL_FAIR)
 	    prompt = "[ANOUNCEMENT ARRIVING...]";
 	else
 	    prompt = "[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]";
     }
     else {
-	if (skill > SKILL_FAIR)
+	if (game.skill > SKILL_FAIR)
 	    prompt = "[CONTINUE?]";
 	else
 	    prompt = "[PRESS ENTER TO CONTINUE]";
@@ -195,6 +205,8 @@ void cgetline(char *line, int max)
     } else {
 	fgets(line, max, stdin);
     }
+    if (logfp)
+	fputs(line, logfp);
     line[strlen(line)-1] = '\0';
 }
 
@@ -295,7 +307,7 @@ void highvideo (void)
     }
 }
  
-void commandhook(char *cmd, int before) {
+void commandhook(char *cmd, bool before) {
 }
 
 /*
@@ -383,7 +395,7 @@ void tracktorpedo(int ix, int iy, int l, int i, int n, int iquad)
 	    skip(1);
 	proutn("%d - %d   ", ix, iy);
     } else {
-	if (game.damage[DSRSENS]==0 || condit==IHDOCKED) {
+	if (game.damage[DSRSENS]==0 || game.condit==IHDOCKED) {
 	    if (i != 1 && l == 1) {
 		drawmaps(2);
 		delay(400);
@@ -422,7 +434,7 @@ void makechart(void)
 void setpassword(void) 
 {
     if (!(game.options & OPTION_CURSES)) {
-	while (TRUE) {
+	for (;;) {
 	    scan();
 	    strcpy(game.passwd, citem);
 	    chew();