X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.c;h=64dcd3d0c1b093a7f593173c558d0adf723d8f34;hp=ae8298407bece129a510c20c444e2c83675cdcc4;hb=3590e0facac5ef56922642ab463ba1ccffd58464;hpb=74121a21cca010c891ef19a178f9b9acf4d473eb

diff --git a/src/sst.c b/src/sst.c
index ae82984..64dcd3d 100644
--- a/src/sst.c
+++ b/src/sst.c
@@ -189,7 +189,7 @@ int seed;		// the random-number seed
 bool idebug;		// debug mode
 FILE *logfp, *replayfp;
 
-char *systnames[NINHAB + 1];
+char *systnames[NINHAB];
 char *device[NDEVICES];
 
 static struct 
@@ -276,7 +276,7 @@ commands[] = {
 	{"HELP",	HELP,		0},
 #define SEED	37
 	{"SEED",	SEED,		0},
-#if BSD_BUG_FOR_BUG
+#ifdef BSD_BUG_FOR_BUG
 #define VISUAL	38
 	{"VISUAL",	VISUAL,		0},
 #endif
@@ -472,13 +472,13 @@ static void makemoves(void)
 		attack(false);		
 	    break;
 	case DAMAGES:			// damages
-	    dreprt();
+	    damagereport();
 	    break;
 	case CHART:			// chart
 	    makechart();
 	    break;
 	case IMPULSE:			// impulse
-	    impuls();
+	    impulse();
 	    break;
 	case REST:			// rest
 	    wait();
@@ -486,7 +486,7 @@ static void makemoves(void)
 		hitme = true;
 	    break;
 	case WARP:			// warp
-	    setwrp();
+	    setwarp();
 	    break;
 	case SCORE:           	 	// score
 	    score();
@@ -518,7 +518,7 @@ static void makemoves(void)
 		hitme = true;
 	    break;
 	case PLANETS:			// Planet list
-	    preport();
+	    survey();
 	    break;
 	case REPORT:			// Game Report 
 	    report();
@@ -540,7 +540,7 @@ static void makemoves(void)
 		hitme = true;
 	    break;
 	case ABANDON:			// Abandon Ship
-	    abandn();
+	    abandon();
 	    break;
 	case DESTRUCT:			// Self Destruct
 	    selfdestruct();
@@ -575,7 +575,7 @@ static void makemoves(void)
 	    if (key == IHREAL)
 		seed = (int)aaitem;
 	    break;
-#if BSD_BUG_FOR_BUG
+#ifdef BSD_BUG_FOR_BUG
 	case VISUAL:
 	    visual();			// perform visual scan
 	    break;
@@ -826,19 +826,12 @@ int scan(void)
 	chew();
 	return IHEOL;
     }
-    if (isdigit(*linep) || *linep=='+' || *linep=='-' || *linep=='.') {
-	// treat as a number
-	i = 0;
-	if (sscanf(linep, "%lf%n", &aaitem, &i) < 1) {
-	    linep = line; // Invalid numbers are ignored
-	    *linep = 0;
-	    return IHEOL;
-	}
-	else {
-	    // skip to end
-	    linep += i;
-	    return IHREAL;
-	}
+    i = 0;
+    // try a number
+    if (sscanf(linep, "%lf%n", &aaitem, &i) > 0) {
+	// skip to end
+	linep += i;
+	return IHREAL;
     }
     // Treat as alpha
     cp = citem;