Compute the maximum number of bases from BASEMAX.

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

diff --git a/setup.c b/setup.c
index 2b360686b7ee282a0c99a0d5880601b91b104377..f50f7c41e02acd3333a257470da5cac1e498aace 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -469,7 +469,7 @@ int choose(int needprompt)
 
     // Use parameters to generate initial values of things
     damfac = 0.5 * skill;
-    game.state.rembase = 3.0*Rand()+2.0;
+    game.state.rembase = 2.0 + Rand()*(MAXBASES-2.0);
     inbase = game.state.rembase;
     if (game.options & OPTION_PLANETS)
        inplan = (PLNETMAX/2) + (PLNETMAX/2+1)*Rand();
@@ -559,7 +559,7 @@ void newqad(int shutup)
            game.kpower[i] = Rand()*150.0 +300.0 +25.0*skill;
        }
        // If we need a commander, promote a Klingon
-       for (i = 1; i <= game.state.remcom ; i++) 
+       for_commanders(i)
            if (game.state.cx[i]==quadx && game.state.cy[i]==quady) break;
                        
        if (i <= game.state.remcom) {