Another step in coalescing all the globals.

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

diff --git a/planets.c b/planets.c
index 133b0daca74fa92ce2a696ab4bf4942b6b0b71ce..ea9aa125337713ab40e03cb36417e11cf4caf987 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -64,7 +64,7 @@ void orbit(void) {
                prout("Already in standard orbit.");\r
                return;\r
        }\r
                prout("Already in standard orbit.");\r
                return;\r
        }\r

-       if (damage[DWARPEN] != 0 && damage[DIMPULS] != 0) {\r
+       if (frozen.damage[DWARPEN] != 0 && frozen.damage[DIMPULS] != 0) {\r

                prout("Both warp and impulse engines damaged.");\r
                return;\r
        }\r
                prout("Both warp and impulse engines damaged.");\r
                return;\r
        }\r


@@ -87,7 +87,7 @@ void orbit(void) {
 void sensor(void) {\r
        skip(1);\r
        chew();\r
 void sensor(void) {\r
        skip(1);\r
        chew();\r

-       if (damage[DSRSENS] != 0.0) {\r
+       if (frozen.damage[DSRSENS] != 0.0) {\r

                prout("Short range sensors damaged.");\r
                return;\r
        }\r
                prout("Short range sensors damaged.");\r
                return;\r
        }\r


@@ -116,9 +116,9 @@ void sensor(void) {
 void beam(void) {\r
        chew();\r
        skip(1);\r
 void beam(void) {\r
        chew();\r
        skip(1);\r

-       if (damage[DTRANSP] != 0) {\r
+       if (frozen.damage[DTRANSP] != 0) {\r

                prout("Transporter damaged.");\r
                prout("Transporter damaged.");\r

-               if (damage[DSHUTTL]==0 && (state.plnets[iplnet].known==2 || iscraft == 1)) {\r
+               if (frozen.damage[DSHUTTL]==0 && (state.plnets[iplnet].known==2 || iscraft == 1)) {\r

                        skip(1);\r
                        prout("Spock-  \"May I suggest the shuttle craft, Sir?\" ");\r
                        if (ja() != 0) shuttle();\r
                        skip(1);\r
                        prout("Spock-  \"May I suggest the shuttle craft, Sir?\" ");\r
                        if (ja() != 0) shuttle();\r


@@ -285,14 +285,14 @@ void shuttle(void) {
        chew();\r
        skip(1);\r
        ididit = 0;\r
        chew();\r
        skip(1);\r
        ididit = 0;\r

-       if(damage[DSHUTTL] != 0.0) {\r
-               if (damage[DSHUTTL] == -1.0) {\r
+       if(frozen.damage[DSHUTTL] != 0.0) {\r
+               if (frozen.damage[DSHUTTL] == -1.0) {\r

                        if (inorbit && state.plnets[iplnet].known == 2)\r
                                prout("Ye Faerie Queene has no shuttle craft bay to dock it at.");\r
                        else\r
                                prout("Ye Faerie Queene had no shuttle craft.");\r
                }\r
                        if (inorbit && state.plnets[iplnet].known == 2)\r
                                prout("Ye Faerie Queene has no shuttle craft bay to dock it at.");\r
                        else\r
                                prout("Ye Faerie Queene had no shuttle craft.");\r
                }\r

-               else if (damage[DSHUTTL] > 0)\r
+               else if (frozen.damage[DSHUTTL] > 0)\r

                        prout("The Galileo is damaged.");\r
                else prout("Shuttle craft is now serving Big Macs.");\r
                return;\r
                        prout("The Galileo is damaged.");\r
                else prout("Shuttle craft is now serving Big Macs.");\r
                return;\r


@@ -337,7 +337,7 @@ void shuttle(void) {
                /* Kirk on planet */\r
                if (iscraft==1) {\r
                        /* Galileo on ship! */\r
                /* Kirk on planet */\r
                if (iscraft==1) {\r
                        /* Galileo on ship! */\r

-                       if (damage[DTRANSP]==0) {\r
+                       if (frozen.damage[DTRANSP]==0) {\r

                                proutn("Spock-  \"Would you rather use the transporter?\" ");\r
                                if (ja() != 0) {\r
                                        beam();\r
                                proutn("Spock-  \"Would you rather use the transporter?\" ");\r
                                if (ja() != 0) {\r
                                        beam();\r


@@ -411,7 +411,7 @@ void deathray(void) {
                prout("Sulu-  \"But Sir, there are no enemies in this quadrant.\"");\r
                return;\r
        }\r
                prout("Sulu-  \"But Sir, there are no enemies in this quadrant.\"");\r
                return;\r
        }\r

-       if (damage[DDRAY] > 0.0) {\r
+       if (frozen.damage[DDRAY] > 0.0) {\r

                prout("Death Ray is damaged.");\r
                return;\r
        }\r
                prout("Death Ray is damaged.");\r
                return;\r
        }\r


@@ -437,7 +437,7 @@ void deathray(void) {
                prouts("Sulu- \"Captain!  It's working!\"");\r
                skip(2);\r
                while (nenhere > 0)\r
                prouts("Sulu- \"Captain!  It's working!\"");\r
                skip(2);\r
                while (nenhere > 0)\r

-                       deadkl(kx[1],ky[1],frozen.quad[kx[1]][ky[1]],kx[1],ky[1]);\r
+                       deadkl(frozen.kx[1],frozen.ky[1],frozen.quad[frozen.kx[1]][frozen.ky[1]],frozen.kx[1],frozen.ky[1]);\r

                prout("Ensign Chekov-  \"Congratulations, Captain!\"");\r
                if (state.remkl == 0) finish(FWON);\r
                prout("Spock-  \"Captain, I believe the `Experimental Death Ray'");\r
                prout("Ensign Chekov-  \"Congratulations, Captain!\"");\r
                if (state.remkl == 0) finish(FWON);\r
                prout("Spock-  \"Captain, I believe the `Experimental Death Ray'");\r


@@ -446,7 +446,7 @@ void deathray(void) {
                }\r
                else {\r
                        prout("   has been rendered disfunctional.\"");\r
                }\r
                else {\r
                        prout("   has been rendered disfunctional.\"");\r

-                       damage[DDRAY] = 39.95;\r
+                       frozen.damage[DDRAY] = 39.95;\r

                }\r
                return;\r
        }\r
                }\r
                return;\r
        }\r