Experimental X code

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

diff --git a/moving.c b/moving.c
index b7afb93ceb2837024e72d4e5c526405858cf6173..a5d11b3e25b7fba12bacd3d2726b8456365a220c 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -153,7 +153,7 @@ void imove(void)
                        if (game.damage[l]>0) 
                            n++;
                    probf=pow(1.4,(energy+shield)/5000.0-1.0)*pow(1.3,1.0/(n+1)-1.0);
-                   if (Rand()>probf) 
+                   if ((game.options & OPTION_BLKHOLE) && Rand()>probf) 
                        timwrp();
                    else 
                        finish(FHOLE);
@@ -209,6 +209,7 @@ no_quad_change:
     newcnd();
     iattak = 0;
     drawmaps(0);
+    setwnd(message_window);
     return;
 }
 
@@ -762,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. */
 }