X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=sst.c;h=77fbeb826ba2b4f273df612835c408f13be1827b;hb=998ff9c48426dd89c25b56ab59a0c8e2b6986355;hp=b06a82fade956d28bd2b9b4f6b32a250d39db369;hpb=4df73495bbade3ebd8b03d68f838f67dd717db8f;p=super-star-trek.git

diff --git a/sst.c b/sst.c
index b06a82f..77fbeb8 100644
--- a/sst.c
+++ b/sst.c
@@ -1,18 +1,13 @@
 #define INCLUDED	// Define externs here
-#include "sst.h"
 #include <ctype.h>
-#include <stdarg.h>
-#ifdef MSDOS
-#include <dos.h>
+#include <getopt.h>
+#include "sst.h"
+
+#ifndef SSTDOC
+#define SSTDOC	"sst.doc"
 #endif
-#include <time.h>
 	
-int getch(void);
-
 static char line[128], *linep = line;
-static int linecount;	/* for paging */
-
-static void clearscreen(void);
 
 /* Compared to original version, I've changed the "help" command to
    "call" and the "terminate" command to "quit" to better match
@@ -39,7 +34,7 @@ static void clearscreen(void);
    2. deathray improvement (but keeping original failure alternatives)
 
    3. Tholian Web
-
+s
    4. Enemies can ram the Enterprise. Regular Klingons and Romulans can
       move in Expert and Emeritus games. This code could use improvement.
 
@@ -134,7 +129,7 @@ static void helpme(void) {
 		cmdbuf[j] = toupper(commands[i][j]);
 	    cmdbuf[j] = '\0';
 	}
-	fp = fopen("sst.doc", "r");
+	fp = fopen(SSTDOC, "r");
 	if (fp == NULL) {
 		prout("Spock-  \"Captain, that information is missing from the");
 		prout("   computer. You need to find SST.DOC and put it in the");
@@ -163,8 +158,7 @@ static void helpme(void) {
 	while (fgets(linebuf, sizeof(linebuf),fp)) {
 		if (strstr(linebuf, "******"))
 			break;
-		linebuf[strlen(linebuf)-1] = '\0'; // No \n at end
-		prout(linebuf);
+		proutc(linebuf);
 	}
 	fclose(fp);
 }
@@ -351,24 +345,30 @@ static void makemoves(void) {
 
 
 int main(int argc, char **argv) {
-	int i;
+    int i, option, usecurses = TRUE;
 	int hitme;
 	char ch;
-	prelim();
-
-	if (argc > 1) {
-		fromcommandline = 1;
-		line[0] = '\0';
-		while (--argc > 0) {
-			strcat(line, *(++argv));
-			strcat(line, " ");
-		}
-	}
-	else fromcommandline = 0;
 
+	while ((option = getopt(argc, argv, "t")) != -1) {
+	    switch (option) {
+	    case 't':
+		usecurses = FALSE;
+		break;
+	    default:
+		fprintf(stderr, "usage: sst [-t] [startcommand...].\n");
+		exit(0);
+	    }
+	}
 
+	iostart(usecurses);
+	prelim(); 
+	line[0] = '\0';
+	for (i = optind; i < argc;  i++) {
+		strcat(line, argv[i]);
+		strcat(line, " ");
+	}
 	while (TRUE) { /* Play a game */
-		setup();
+		setup(line[0] == '\0');
 		if (alldone) {
 			score();
 			alldone = 0;
@@ -389,7 +389,8 @@ int main(int argc, char **argv) {
 		if (!ja()) break;
 	}
 	skip(1);
-	prout("May the Great Bird of the Galaxy roost upon your home planet.");
+	ioend();
+	puts("May the Great Bird of the Galaxy roost upon your home planet.");
 }
 
 
@@ -425,7 +426,7 @@ char *cramlc(enum loctype key, int x, int y) {
 void crmena(int i, int enemy, int key, int x, int y) {
 	if (i == 1) proutn("***");
 	cramen(enemy);
-	proutn(" at");
+	proutn(" at ");
 	proutn(cramlc(key, x, y));
 }
 
@@ -463,14 +464,12 @@ void iran10(int *i, int *j) {
 }
 
 void chew(void) {
-	linecount = 0;
 	linep = line;
 	*linep = 0;
 }
 
 void chew2(void) {
 	/* return IHEOL next time */
-	linecount = 0;
 	linep = line+1;
 	*linep = 0;
 }
@@ -479,8 +478,6 @@ int scan(void) {
 	int i;
 	char *cp;
 
-	linecount = 0;
-
 	// Init result
 	aaitem = 0.0;
 	*citem = 0;
@@ -491,8 +488,7 @@ int scan(void) {
 			chew();
 			return IHEOL;
 		}
-		fgets(line, sizeof(line), stdin);
-		line[strlen(line)-1] = '\0';
+		getline(line, sizeof(line));
 		linep = line;
 	}
 	// Skip leading white space
@@ -538,85 +534,6 @@ int ja(void) {
 
 double square(double i) { return i*i; }
 									
-static void clearscreen(void) {
-	/* Somehow we need to clear the screen */
-#ifdef __BORLANDC__
-	extern void clrscr(void);
-	clrscr();
-#else
-	proutn("\033[2J");	/* Hope for an ANSI display */
-#endif
-}
-
-/* We will pull these out in case we want to do something special later */
-
-void pause(int i) {
-	putchar('\n');
-	if (i==1) {
-		if (skill > 2)
-			prout("[ANOUNCEMENT ARRIVING...]");
-		else
-			prout("[IMPORTANT ANNOUNCEMENT ARRIVING -- HIT SPACE BAR TO CONTINUE]");
-		getch();
-	}
-	else {
-		if (skill > 2)
-			proutn("[CONTINUE?]");
-		else
-			proutn("[HIT SPACE BAR TO CONTINUE]");
-		getch();
-		proutn("\r                           \r");
-	}
-	if (i != 0) {
-		clearscreen();
-	}
-	linecount = 0;
-}
-
-
-void skip(int i) {
-	while (i-- > 0) {
-		linecount++;
-		if (linecount >= 23)
-			pause(0);
-		else
-			putchar('\n');
-	}
-}
-
-
-void proutn(char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    vprintf(fmt, ap);
-    va_end(ap);
-}
-
-void prout(char *fmt, ...) {
-    va_list ap;
-    va_start(ap, fmt);
-    vprintf(fmt, ap);
-    va_end(ap);
-    skip(1);
-}
-
-void prouts(char *fmt, ...) {
-	clock_t endTime;
-	char *s, buf[BUFSIZ];
-	/* print slowly! */
-	va_list ap;
-	va_start(ap, fmt);
-	vsprintf(buf, fmt, ap);
-	va_end(ap);
-	skip(1);
-	for (s = buf; *s; s++) {
-		endTime = clock() + CLOCKS_PER_SEC*0.05;
-		while (clock() < endTime) ;
-		putchar(*s);
-		fflush(stdout);
-	}
-}
-
 void huh(void) {
 	chew();
 	skip(1);