Another documentation update.

[super-star-trek.git] / moving.c

diff --git a/moving.c b/moving.c
index 31374c2ebd4bdd82c85e6ebfc9617b2e7736d07e..7d3f6dfcbbb52eaca28e37ba13a596cc1fcdb447 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -97,9 +97,10 @@ void imove(void)
                        finish(FNEG3);
                        return;
                    }
-                   prout("\n\rYOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER\n\r"
-                         "AT THE EDGE OF THE GALAXY.  THE THIRD TIME YOU TRY THIS,\n\r"
-                         "YOU WILL BE DESTROYED.\n\r");
+                   skip(1);
+                   prout("YOU HAVE ATTEMPTED TO CROSS THE NEGATIVE ENERGY BARRIER");
+                   prout("AT THE EDGE OF THE GALAXY.  THE THIRD TIME YOU TRY THIS,");
+                   prout("YOU WILL BE DESTROYED.");
                }
                /* Compute final position in new quadrant */
                if (trbeam) return; /* Don't bother if we are to be beamed */
@@ -107,7 +108,8 @@ void imove(void)
                quady = (iy+(QUADSIZE-1))/QUADSIZE;
                sectx = ix - QUADSIZE*(quadx-1);
                secty = iy - QUADSIZE*(quady-1);
-               prout("\n\rEntering %s.",
+               skip(1);
+               prout("Entering %s.",
                      cramlc(quadrant, quadx, quady));
                game.quad[sectx][secty] = ship;
                newqad(0);
@@ -207,6 +209,7 @@ no_quad_change:
     newcnd();
     iattak = 0;
     drawmaps(0);
+    setwnd(message_window);
     return;
 }
 
@@ -233,7 +236,7 @@ void dock(int l)
     shield = inshld;
     torps = intorps;
     lsupres = inlsr;
-    if (stdamtim != FOREVER &&
+    if (game.damage[DRADIO] == 0.0 &&
        (game.future[FCDBAS] < FOREVER || isatb == 1) && iseenit == 0) {
        /* get attack report from base */
        prout("Lt. Uhura- \"Captain, an important message from the starbase:\"");
@@ -639,8 +642,8 @@ void setwrp(void)
        return;
     }
     if (game.damage[DWARPEN] > 0.0 && aaitem > 4.0) {
-       prout("Engineer Scott- \"I'm doing my best, Captain,\n"
-             "  but right now we can only go warp 4.\"");
+       prout("Engineer Scott- \"I'm doing my best, Captain,");
+       prout("  but right now we can only go warp 4.\"");
        return;
     }
     if (aaitem > 10.0) {
@@ -760,7 +763,7 @@ void atover(int igrab)
     } while 
        /* Repeat if another snova */
        (game.state.galaxy[quadx][quady].supernova);
-    if (game.state.remkl==0) 
+    if (KLINGREM==0) 
        finish(FWON); /* Snova killed remaining enemy. */
 }
 
@@ -955,7 +958,6 @@ void help(void)
            /* found one -- finish up */
            sectx=ix;
            secty=iy;
-           game.quad[ix][iy]=IHMATER0;
            break;
        }
     }
@@ -974,22 +976,26 @@ void help(void)
        }
        proutn(" attempt to re-materialize ");
        crmshp();
-       warble();
-       if (Rand() > probf) break;
        switch (l){
-       case 1: game.quad[ix][iy]=IHMATER1;
+       case 1: game.quad[ix][iy]=IHMATER0;
            break;
-       case 2: game.quad[ix][iy]=IHMATER2;
+       case 2: game.quad[ix][iy]=IHMATER1;
            break;
-       case 3: game.quad[ix][iy]=IHQUEST;
+       case 3: game.quad[ix][iy]=IHMATER2;
            break;
        }
        textcolor(RED);
+       warble();
+       if (Rand() > probf) break;
        prout("fails.");
        delay(500);
        textcolor(DEFAULT);
     }
     if (l > 3) {
+       game.quad[ix][iy]=IHQUEST;
+       alive = 0;
+       drawmaps(1);
+       setwnd(message_window);
        finish(FMATERIALIZE);
        return;
     }