X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsst.c;h=d19698491d71a64611cf7b7a0fd6a99591a9d6cd;hp=021e3d9bef3885a69f8c290e46043ca4d6b9b5ab;hb=0f68a074434296ae409accdc39ba0142600ea255;hpb=b3d872bf30cc6b7e4a0b88f0580c2f5e35ccaf2d

diff --git a/src/sst.c b/src/sst.c
index 021e3d9..d196984 100644
--- a/src/sst.c
+++ b/src/sst.c
@@ -162,6 +162,17 @@ for a lot of magic numbers and refactored the heck out of it.
       type is "plain" or "almy".)
 
    6. User input is now logged so we can do regression testing.
+
+   7. More BSD-Trek features: You can now lose if your entire crew
+      dies in battle.  When abandoning ship in a game with inhabited
+      worlds enabled, they must have one in the quadrant to beam down
+      to; otherwise they die in space and this counts heavily against
+      your score.  Docking at a starbase replenishes your crew.
+
+   8. Still more BSD-Trek: we now have a weighted damage table.
+      Also, the nav subsystem (enabling automatic course
+      setting) can be damaged separately from the main computer (which
+      handles weapons targeting, ETA calculation, and self-destruct).
 */
 
 /* the input queue */
@@ -169,7 +180,7 @@ static char line[128], *linep = line;
 
 struct game game;
 coord thing;
-int iqhere, iqengry;
+bool iqhere, iqengry;
 int iscore, iskill;	// Common PLAQ
 double aaitem;
 double perdate;
@@ -190,6 +201,7 @@ char *device[NDEVICES] = {
 	"Subspace Radio",
 	"Shuttle Craft",
 	"Computer",
+	"Navigation System",
 	"Transporter",
 	"Shield Control",
 	"Death Ray",
@@ -284,7 +296,9 @@ commands[] = {
 #define NUMCOMMANDS	sizeof(commands)/sizeof(commands[0])
 #define ACCEPT(i)	(!commands[i].option || (commands[i].option & game.options))
 
-static void listCommands(void) {
+static void listCommands(void) 
+/* generate a list of legal commands */
+{
     int i, k = 0;
     proutn("LEGAL COMMANDS ARE:");
     for (i = 0; i < NUMCOMMANDS; i++) {
@@ -298,7 +312,8 @@ static void listCommands(void) {
     skip(1);
 }
 
-static void helpme(void) 
+static void helpme(void)
+/* browse on-line help */
 {
     int i, j;
     char cmdbuf[32], *cp;
@@ -377,12 +392,14 @@ static void helpme(void)
     fclose(fp);
 }
 
-void enqueue(char *s) 
+void enqueue(char *s)
+/* enqueue input for the command parser */
 {
     strcpy(line, s);
 }
 
-static void makemoves(void) 
+static void makemoves(void)
+/* command-interpretation loop */
 {
     int key, i, v = 0;
     bool hitme;
@@ -392,7 +409,7 @@ static void makemoves(void)
 	drawmaps(1);
 	for(;;)  { /* get a command */
 	    hitme = false;
-	    game.justin = 0;
+	    game.justin = false;
 	    game.optime = 0.0;
 	    i = -1;
 	    chew();
@@ -403,7 +420,7 @@ static void makemoves(void)
 		makechart();
 		continue;
 	    }
-	    game.ididit=0;
+	    game.ididit = false;
 	    clrscr();
 	    setwnd(message_window);
 	    clrscr();
@@ -449,10 +466,10 @@ static void makemoves(void)
 	    warp(false);
 	    break;
 	case SHIELDS:			// shields
-	    doshield(1);
+	    doshield(false);
 	    if (game.ididit) {
-		hitme=true;
-		game.shldchg = 0;
+		hitme = true;
+		game.shldchg = false;
 	    }
 	    break;
 	case DOCK:			// dock
@@ -463,7 +480,7 @@ static void makemoves(void)
 	    dreprt();
 	    break;
 	case CHART:			// chart
-	    chart(0);
+	    chart(false);
 	    break;
 	case IMPULSE:			// impulse
 	    impuls();
@@ -525,7 +542,7 @@ static void makemoves(void)
 	    abandn();
 	    break;
 	case DESTRUCT:			// Self Destruct
-	    dstrct();
+	    selfdestruct();
 	    break;
 	case SAVE:			// Save Game
 	    freeze(false);
@@ -545,7 +562,7 @@ static void makemoves(void)
 	    if (game.ididit) hitme = true;
 	    break;
 	case QUIT:
-	    game.alldone = 1;		// quit the game
+	    game.alldone = true;		// quit the game
 	    break;
 	case HELP:
 	    helpme();			// get help
@@ -564,14 +581,14 @@ static void makemoves(void)
 		if (game.alldone) break;	// Events did us in
 	    }
 	    if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) { // Galaxy went Nova!
-		atover(0);
+		atover(false);
 		continue;
 	    }
-	    if (hitme && game.justin==0) {
+	    if (hitme && !game.justin) {
 		attack(2);
 		if (game.alldone) break;
 		if (game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova) {	// went NOVA! 
-		    atover(0);
+		    atover(false);
 		    hitme = true;
 		    continue;
 		}
@@ -641,7 +658,7 @@ int main(int argc, char **argv)
 	setup(line[0] == '\0');
 	if (game.alldone) {
 	    score();
-	    game.alldone = 0;
+	    game.alldone = false;
 	}
 	else makemoves();
 	skip(1);
@@ -650,7 +667,7 @@ int main(int argc, char **argv)
 
 	if (game.tourn && game.alldone) {
 	    proutn("Do you want your score recorded?");
-	    if (ja()) {
+	    if (ja() == true) {
 		chew2();
 		freeze(false);
 	    }
@@ -664,7 +681,8 @@ int main(int argc, char **argv)
 }
 
 
-void cramen(int i) 
+void cramen(feature i) 
+/* print the name of an enemy */
 {
     /* return an enemy */
     char *s;
@@ -687,6 +705,7 @@ void cramen(int i)
 }
 
 char *cramlc(enum loctype key, coord w)
+/* name a location */
 {
     static char buf[32];
     buf[0] = '\0';
@@ -696,15 +715,17 @@ char *cramlc(enum loctype key, coord w)
     return buf;
 }
 
-void crmena(int i, int enemy, int key, coord w) 
+void crmena(bool stars, feature enemy, enum loctype key, coord w) 
+/* print an enemy and his location */
 {
-    if (i == 1) proutn("***");
+    if (stars) proutn("***");
     cramen(enemy);
     proutn(" at ");
     proutn(cramlc(key, w));
 }
 
-void crmshp(void) 
+void crmshp(void)
+/* print our ship name */
 {
     char *s;
     switch (game.ship) {
@@ -715,7 +736,8 @@ void crmshp(void)
     proutn(s);
 }
 
-void stars(void) 
+void stars(void)
+/* print a line of stars */
 {
     prouts("******************************************************");
     skip(1);
@@ -731,10 +753,13 @@ double Rand(void)
     return rand()/(1.0 + (double)RAND_MAX);
 }
 
-void iran(int size, int *i, int *j) 
+coord randplace(int size)
+/* choose a random location */ 
 {
-    *i = Rand()*(size*1.0) + 1.0;
-    *j = Rand()*(size*1.0) + 1.0;
+    coord w;
+    w.x = Rand()*(size*1.0) + 1.0;
+    w.y = Rand()*(size*1.0) + 1.0;
+    return w;
 }
 
 void chew(void)
@@ -805,7 +830,8 @@ int scan(void)
     return IHALPHA;
 }
 
-bool ja(void) 
+bool ja(void)
+/* yes-or-no confirmation */
 {
     chew();
     for(;;) {
@@ -817,46 +843,45 @@ bool ja(void)
     }
 }
 
-void huh(void) 
+void huh(void)
+/* complain about unparseable input */
 {
     chew();
     skip(1);
     prout("Beg your pardon, Captain?");
 }
 
-int isit(char *s) 
+bool isit(char *s) 
+/* compares s to citem and returns true if it matches to the length of s */
 {
-    /* New function -- compares s to scanned citem and returns true if it
-       matches to the length of s */
-
     return strncasecmp(s, citem, max(1, strlen(citem))) == 0;
-
 }
 
-void debugme(void) 
+void debugme(void)
+/* access to the internals for debugging */
 {
     proutn("Reset levels? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	if (game.energy < game.inenrg) game.energy = game.inenrg;
 	game.shield = game.inshld;
 	game.torps = game.intorps;
 	game.lsupres = game.inlsr;
     }
     proutn("Reset damage? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	int i;
 	for (i=0; i < NDEVICES; i++) 
 	    if (game.damage[i] > 0.0) 
 		game.damage[i] = 0.0;
     }
     proutn("Toggle debug flag? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	idebug = !idebug;
 	if (idebug) prout("Debug output ON");
 	else prout("Debug output OFF");
     }
     proutn("Cause selective damage? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	int i, key;
 	for (i=0; i < NDEVICES; i++) {
 	    proutn("Kill ");
@@ -870,7 +895,7 @@ void debugme(void)
 	}
     }
     proutn("Examine/change events? ");
-    if (ja() != 0) {
+    if (ja() == true) {
 	event *ev;
 	coord w;
 	int i;
@@ -932,8 +957,8 @@ void debugme(void)
 	chew();
     }
     proutn("Induce supernova here? ");
-    if (ja()) {
+    if (ja() == true) {
 	game.state.galaxy[game.quadrant.x][game.quadrant.y].supernova = true;
-	atover(1);
+	atover(true);
     }
 }