X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=sst.c;h=b3a0202663bd5d6760366c82f8a1bf73d4f24545;hb=dd95aad0a184fc4f2ab4cd13323a70c9833acc2b;hp=f6db8870c9ae1856cf8eb55d345ac0981475a7c6;hpb=77e371705e1e059173ec9c88f63be7a460e44e50;p=super-star-trek.git

diff --git a/sst.c b/sst.c
index f6db887..b3a0202 100644
--- a/sst.c
+++ b/sst.c
@@ -1,6 +1,7 @@
 #define INCLUDED	// Define externs here
 #include "sst.h"
 #include <ctype.h>
+#include <stdarg.h>
 #ifdef MSDOS
 #include <dos.h>
 #endif
@@ -10,6 +11,7 @@ int getch(void);
 
 static char line[128], *linep = line;
 static int linecount;	/* for paging */
+static int screenheight = 24;
 
 static void clearscreen(void);
 
@@ -102,7 +104,7 @@ static void listCommands(int x) {
 
 static void helpme(void) {
 	int i, j;
-	char cmdbuf[32];
+	char cmdbuf[32], *cp;
 	char linebuf[132];
 	FILE *fp;
 	/* Give help on commands */
@@ -129,9 +131,9 @@ static void helpme(void) {
 		strcpy(cmdbuf, " ABBREV");
 	}
 	else {
-		strcpy(cmdbuf, "  Mnemonic:  ");
-		j = 0;
-		while ((cmdbuf[j+13] = toupper(commands[i][j])) != 0) j++;
+	    for (j = 0; commands[i][j]; j++)
+		cmdbuf[j] = toupper(commands[i][j]);
+	    cmdbuf[j] = '\0';
 	}
 	fp = fopen("sst.doc", "r");
 	if (fp == NULL) {
@@ -140,26 +142,31 @@ static void helpme(void) {
 		prout("   current directory.\"");
 		return;
 	}
-	i = strlen(cmdbuf);
-	do {
-		if (fgets(linebuf, 132, fp) == NULL) {
+	for (;;) {
+	    if (fgets(linebuf, sizeof(linebuf), fp) == NULL) {
 			prout("Spock- \"Captain, there is no information on that command.\"");
 			fclose(fp);
 			return;
 		}
-	} while (strncmp(linebuf, cmdbuf, i) != 0);
+	    if (linebuf[0] == '%' && linebuf[1] == '%'&& linebuf[2] == ' ') {
+		for (cp = linebuf+3; isspace(*cp); cp++)
+			continue;
+		linebuf[strlen(linebuf)-1] = '\0';
+		if (strcmp(cp, cmdbuf) == 0)
+		    break;
+	    }
+	}
 
 	skip(1);
 	prout("Spock- \"Captain, I've found the following information:\"");
 	skip(1);
 
-	do {
-		if (linebuf[0]!=12) { // ignore page break lines 
-			linebuf[strlen(linebuf)-1] = '\0'; // No \n at end
-			prout(linebuf);
-		}
-		fgets(linebuf,132,fp);
-	} while (strstr(linebuf, "******")==NULL);
+	while (fgets(linebuf, sizeof(linebuf),fp)) {
+		if (strstr(linebuf, "******"))
+			break;
+		/* use fputs here to avoid % expansion */
+		fputs(linebuf, stdout);
+	}
 	fclose(fp);
 }
 
@@ -349,6 +356,10 @@ int main(int argc, char **argv) {
 	int hitme;
 	char ch;
 	prelim();
+	char *LINES = getenv("LINES");
+ 
+	if (LINES)
+	    screenheight = atoi(LINES);
 
 	if (argc > 1) {
 		fromcommandline = 1;
@@ -373,13 +384,13 @@ int main(int argc, char **argv) {
 		skip(1);
 
 		if (tourn && alldone) {
-			printf("Do you want your score recorded?");
+			proutn("Do you want your score recorded?");
 			if (ja()) {
 				chew2();
 				freeze(FALSE);
 			}
 		}
-		printf("Do you want to play again?");
+		proutn("Do you want to play again?");
 		if (!ja()) break;
 	}
 	skip(1);
@@ -407,20 +418,20 @@ void cramen(int i) {
 	proutn(s);
 }
 
-void cramlc(int key, int x, int y) {
-	if (key == 1) proutn(" Quadrant");
-	else if (key == 2) proutn(" Sector");
-	proutn(" ");
-	crami(x, 1);
-	proutn(" - ");
-	crami(y, 1);
+char *cramlc(enum loctype key, int x, int y) {
+	static char buf[32];
+	buf[0] = '\0';
+	if (key == quadrant) strcpy(buf, "Quadrant ");
+	else if (key == sector) strcpy(buf, "Sector ");
+	sprintf(buf+strlen(buf), "%d-%d", x, y);
+	return buf;
 }
 
 void crmena(int i, int enemy, int key, int x, int y) {
 	if (i == 1) proutn("***");
 	cramen(enemy);
 	proutn(" at");
-	cramlc(key, x, y);
+	proutn(cramlc(key, x, y));
 }
 
 void crmshp(void) {
@@ -530,18 +541,6 @@ int ja(void) {
 	}
 }
 
-void cramf(double x, int w, int d) {
-	char buf[64];
-	sprintf(buf, "%*.*f", w, d, x);
-	proutn(buf);
-}
-
-void crami(int i, int w) {
-	char buf[16];
-	sprintf(buf, "%*d", w, i);
-	proutn(buf);
-}
-
 double square(double i) { return i*i; }
 									
 static void clearscreen(void) {
@@ -583,7 +582,7 @@ void pause(int i) {
 void skip(int i) {
 	while (i-- > 0) {
 		linecount++;
-		if (linecount >= 23)
+		if (linecount >= screenheight)
 			pause(0);
 		else
 			putchar('\n');
@@ -591,22 +590,34 @@ void skip(int i) {
 }
 
 
-void proutn(char *s) {
-	fputs(s, stdout);
+void proutn(char *fmt, ...) {
+    va_list ap;
+    va_start(ap, fmt);
+    vprintf(fmt, ap);
+    va_end(ap);
 }
 
-void prout(char *s) {
-	proutn(s);
-	skip(1);
+void prout(char *fmt, ...) {
+    va_list ap;
+    va_start(ap, fmt);
+    vprintf(fmt, ap);
+    va_end(ap);
+    skip(1);
 }
 
-void prouts(char *s) {
+void prouts(char *fmt, ...) {
 	clock_t endTime;
+	char *s, buf[BUFSIZ];
 	/* print slowly! */
-	while (*s) {
+	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++);
+		putchar(*s);
 		fflush(stdout);
 	}
 }
@@ -676,7 +687,7 @@ void debugme(void) {
 				case FSCMOVE: proutn("SC Move         "); break;
 				case FSCDBAS: proutn("SC Base Destroy "); break;
 			}
-			cramf(future[i]-game.state.date, 8, 2);
+			proutn("%.2f", future[i]-game.state.date);
 			chew();
 			proutn("  ?");
 			key = scan();