Get rid of FORTRANisms.

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

diff --git a/sst.c b/sst.c
index f6b21c7c2be6c419ee4446bcaae68672649a8084..23e10016f42312fd7c8994f33b0ecffe3b5f9f58 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -87,10 +87,15 @@ Here are Stas Sergeev's changes:
 
 Eric Raymond's changes:
 
 
 Eric Raymond's changes:
 

+ Mainly, I translated this C code out of FORTRAN into C -- created #defines
+   for a lot of magic numbers.
+

    1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
 
    2. Status report now indicates when dilithium crystals are on board.
 
    1. "sos" and "call" becomes "mayday", "freeze" and "save" are both good.
 
    2. Status report now indicates when dilithium crystals are on board.
 

+   3. Can now report starbases left in scrscan.
+

    */
 
 /* the input queue */
    */
 
 /* the input queue */


@@ -418,7 +423,7 @@ static void makemoves(void) {
                        case SAVE:                      // Save Game
                                freeze(FALSE);
                                 clrscr();
                        case SAVE:                      // Save Game
                                freeze(FALSE);
                                 clrscr();

-                               if (skill > 3)
+                               if (skill > SKILL_GOOD)

                                         prout("WARNING--Saved games produce no plaques!");
                                break;
                        case DEATHRAY:          // Try a desparation measure
                                         prout("WARNING--Saved games produce no plaques!");
                                break;
                        case DEATHRAY:          // Try a desparation measure


@@ -454,14 +459,14 @@ static void makemoves(void) {
                                events();
                                if (alldone) break;             // Events did us in
                        }
                                events();
                                if (alldone) break;             // Events did us in
                        }

-                       if (game.state.galaxy[quadx][quady] == 1000) { // Galaxy went Nova!
+                       if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) { // Galaxy went Nova!

                                atover(0);
                                continue;
                        }
                        if (hitme && justin==0) {
                                attack(2);
                                if (alldone) break;
                                atover(0);
                                continue;
                        }
                        if (hitme && justin==0) {
                                attack(2);
                                if (alldone) break;

-                               if (game.state.galaxy[quadx][quady] == 1000) {  // went NOVA! 
+                               if (game.state.galaxy[quadx][quady] == SUPERNOVA_PLACE) {       // went NOVA! 

                                        atover(0);
                                        hitme = TRUE;
                                        continue;
                                        atover(0);
                                        hitme = TRUE;
                                        continue;


@@ -586,14 +591,9 @@ double Rand(void) {
        return rand()/(1.0 + (double)RAND_MAX);
 }
 
        return rand()/(1.0 + (double)RAND_MAX);
 }
 

-void iran8(int *i, int *j) {
-       *i = Rand()*8.0 + 1.0;
-       *j = Rand()*8.0 + 1.0;
-}
-
-void iran10(int *i, int *j) {
-       *i = Rand()*10.0 + 1.0;
-       *j = Rand()*10.0 + 1.0;
+void iran(int size, int *i, int *j) {
+    *i = Rand()*(size*1.0) + 1.0;
+    *j = Rand()*(size*1.0) + 1.0;

 }
 
 void chew(void) {
 }
 
 void chew(void) {