Another step in coalescing all the globals.

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

diff --git a/finish.c b/finish.c
index e396759591e6058069467f9b13fbff7fdc5e53bd..f355b5a69f855c929b522117477957a0c376f75a 100644 (file)
--- a/finish.c
+++ b/finish.c
@@ -5,7 +5,7 @@
 void dstrct() {\r
        /* Finish with a BANG! */\r
        chew();\r
-       if (damage[DCOMPTR] != 0.0) {\r
+       if (frozen.damage[DCOMPTR] != 0.0) {\r
                prout("Computer damaged; cannot execute destruct sequence.");\r
                return;\r
        }\r
@@ -22,7 +22,7 @@ void dstrct() {
        prout("SELF-DESTRUCT-SEQUENCE-WILL-BE-ABORTED");\r
        scan();\r
        chew();\r
-       if (strcmp(passwd, citem) != 0) {\r
+       if (strcmp(frozen.passwd, citem) != 0) {\r
                prouts("PASSWORD-REJECTED;"); skip(1);\r
                prout("CONTINUITY-EFFECTED");\r
                skip(1);\r
@@ -55,8 +55,8 @@ void kaboom(void) {
                double whammo = 25.0 * energy;\r
                int l=1;\r
                while (l <= nenhere) {\r
-                       if (kpower[l]*kdist[l] <= whammo) \r
-                               deadkl(kx[l],ky[l], frozen.quad[kx[l]][ky[l]], kx[l], ky[l]);\r
+                       if (frozen.kpower[l]*frozen.kdist[l] <= whammo) \r
+                               deadkl(frozen.kx[l],frozen.ky[l], frozen.quad[frozen.kx[l]][frozen.ky[l]], frozen.kx[l], frozen.ky[l]);\r
                        l++;\r
                }\r
        }\r