The quad global gets pulled into the frozen structure.

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

diff --git a/moving.c b/moving.c
index 9eb70960c277f72971d3d356e0fec83af5253cf4..24c9643e6187cc3e054a4b94ece8d303443b1ff3 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -31,7 +31,7 @@ void move(void) {
                Time = future[FTBEAM] - state.date + 1e-5;\r
        }\r
        /* Move within the quadrant */\r
-       quad[sectx][secty] = IHDOT;\r
+       frozen.quad[sectx][secty] = IHDOT;\r
        x = sectx;\r
        y = secty;\r
        n = 10.0*dist*bigger+0.5;\r
@@ -101,11 +101,11 @@ void move(void) {
                                proutn("\nEntering");\r
                                cramlc(1, quadx, quady);\r
                                skip(1);\r
-                               quad[sectx][secty] = ship;\r
+                               frozen.quad[sectx][secty] = ship;\r
                                newqad(0);\r
                                return;\r
                        }\r
-                       iquad = quad[ix][iy];\r
+                       iquad = frozen.quad[ix][iy];\r
                        if (iquad != IHDOT) {\r
                                /* object encountered in flight path */\r
                                stopegy = 50.0*dist/Time;\r
@@ -170,7 +170,7 @@ void move(void) {
        finaly = secty;\r
 label100:\r
        /* No quadrant change -- compute new avg enemy distances */\r
-       quad[sectx][secty] = ship;\r
+       frozen.quad[sectx][secty] = ship;\r
        if (nenhere) {\r
                for (l = 1; l <= nenhere; l++) {\r
                        finald = sqrt((ix-kx[l])*(double)(ix-kx[l]) +\r
@@ -567,7 +567,7 @@ void warp(int i) {
                                y += deltay;\r
                                iy = y +0.5;\r
                                if (iy < 1 || iy > 10) break;\r
-                               if (quad[ix][iy] != IHDOT) {\r
+                               if (frozen.quad[ix][iy] != IHDOT) {\r
                                        blooey = 0;\r
                                        twarp = 0;\r
                                }\r
@@ -921,7 +921,7 @@ void help(void) {
                newqad(1);\r
        }\r
        /* dematerialize starship */\r
-       quad[sectx][secty]=IHDOT;\r
+       frozen.quad[sectx][secty]=IHDOT;\r
        proutn("Starbase in");\r
        cramlc(1, quadx, quady);\r
        proutn(" responds--");\r
@@ -949,12 +949,12 @@ void help(void) {
        for (l = 1; l <= 5; l++) {\r
                ix = basex+3.0*Rand()-1;\r
                iy = basey+3.0*Rand()-1;\r
-               if (ix>=1 && ix<=10 && iy>=1 && iy<=10 && quad[ix][iy]==IHDOT) {\r
+               if (ix>=1 && ix<=10 && iy>=1 && iy<=10 && frozen.quad[ix][iy]==IHDOT) {\r
                        /* found one -- finish up */\r
                        prout("succeeds.");\r
                        sectx=ix;\r
                        secty=iy;\r
-                       quad[ix][iy]=ship;\r
+                       frozen.quad[ix][iy]=ship;\r
                        dock();\r
                        skip(1);\r
                        prout("Lt. Uhura-  \"Captain, we made it!\"");\r