2011-02-23 Nicolas Laplume <[email protected]>

*V258 *Changed Version to 1.0.0 *Readded Atlas/R7 Booster capacity *Other fixed bugs
raceintospace · Feb 23, 2011 · 0da4e5e · 0da4e5e
1 parent f94cb09
commit 0da4e5e
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 34 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,22 @@
+2011-02-23	Nicolas Laplume <[email protected]>
+
+	* V258
+
+	* configure.in: Changed version to 1.0.0
+
+	* vab.c, options.c, options.h: Readded Atlas/R7 Booster capacity (removed option to turn it off)
+
+	* prest.c: Changed Prestige Seconds text from "(SCD)" to "(2ND)"
+
+	* budget.c: Fixed bug in Viewing Stand when flown missions was fewer than 3
+
+	* mission.dat: Fixed bug in Lunar Missions (from V252)
+
 2011-02-20	Nicolas Laplume <[email protected]>
 
 	* V257
 
-	* Fixed bug in some failures in Lunar Missions (from V252)
+	* mission.dat: Fixed bug in some failures in Lunar Missions (from V252)
 
 	* place.c: Changed the Prestige First screen in Mission Review to show also Prestige Seconds
 
@@ -12,37 +26,33 @@
 
 	* V256
 
-	* Fixed bug in the order of the missions in 2-players games
-
-	* Readded Atlas/R7 Booster capacity (removed option to turn it off)
+	* newmis.c: Fixed bug in the order of the missions in 2-players games
 
 2011-02-14	Nicolas Laplume <[email protected]>
 
 	* V255
 
-	* Fixed bug in the naut morale caluclations. Changed the penalty/bonus when crewmates are compatible
-
-	* Added Prestige First in Mission Review
+	* start.c: Fixed bug in the naut morale caluclations. Changed the penalty/bonus when crewmates are compatible
 
-	* Viwing Stand now shows all missions, not just last 3
+	* place.c: Added Prestige First in Mission Review
 
-	* VAB's Autopurchase now shows the price of the equipment
+	* budget.c: Viwing Stand now shows all missions, not just last 3
 
-	* Changed version to 1.0.0
+	* vab.c: VAB's Autopurchase now shows the price of the equipment
 
-	* Removed Atlas Booster capacity (can be turned on in config file)
+	* vab.c, options: Removed Atlas Booster capacity (can be turned on in config file)
 
-	* Added Cheat to enable sucessful missions increase R&DMax
+	* mc.c, options: Added Cheat to enable sucessful missions increase R&DMax
 
 2011-02-10	Nicolas Laplume <[email protected]>
 
 	* V254
 
-	* Added FIX button in R&D and Hardware Purchase
+	* rdplex.c: Added FIX button in R&D and Hardware Purchase
 
-	* Added option to enable Atlas to lunar missions
+	* vab.c, options: Added option to enable Atlas to lunar missions
 
-	* Changed version to 0.4.9
+	* configure.in: Changed version to 0.4.9
 
 2011-01-05	Leon Baradat <[email protected]>
 
@@ -54,15 +64,15 @@
 
 	* V252
 
-	* Added Reentry Corridor step to Lunar Missions
+	* mc2.c, mission.dat: Added Reentry Corridor step to Lunar Missions
 
 2010-12-18	Nicolas Laplume <[email protected]>
 
 	* V251
 
-	* Fixed duration level when failed
+	* mis_m.c: Fixed duration level when failed
 
-	* Changed last Adv Training to III if shorter Adv Training is on
+	* ast4.c: Changed last Adv Training to III if shorter Adv Training is on
 
 2010-10-24	Nicolas Laplume <[email protected]>
 

diff --git a/budget.c b/budget.c
@@ -440,6 +440,7 @@ void DrawViewing(char plr)
 
   DrawPreviousMissions (plr);
   IOBox(4,26,77,40);IOBox(242,26,315,40); InBox(244,28,313,38);
+  if (Data->P[plr].PastMis<4) InBox(6,28,75,38);
   LTArrow(24,30);RTArrow(262,30);
 
   return;
@@ -584,17 +585,18 @@ void Viewing(char plr)
 		else if (key=='O' || (mousebuttons>0 && x>=6 && y>=28 && x<=75 && y<=38)) {
 			olderMiss++;
 			if (olderMiss>Data->P[plr].PastMis-2) olderMiss=Data->P[plr].PastMis-2;
+			if (olderMiss<1) olderMiss=1;
 			if (olderMiss!=1)OutBox(244,28,313,38); //Boton Newer
 			InBox(6,28,75,38); //Botton Older
       		// Debe dibujar la mission
       		DrawPreviousMissions (plr);
       		bzdelay (DELAYCNT);
-      		if (olderMiss!=Data->P[plr].PastMis-2) OutBox(6,28,75,38); //Boton Older
+      		if (olderMiss!=Data->P[plr].PastMis-2 && Data->P[plr].PastMis>3) OutBox(6,28,75,38); //Boton Older
 			}
 		else if (key=='N' || (mousebuttons>0 && x>=244 && y>=28 && x<=313 && y<=38))  {
 			olderMiss--;
 			if (olderMiss<1) olderMiss=1;
-			if (olderMiss!=Data->P[plr].PastMis-2) OutBox(6,28,75,38); //Boton Older
+			if (olderMiss!=Data->P[plr].PastMis-2 && Data->P[plr].PastMis>3) OutBox(6,28,75,38); //Boton Older
 			InBox(244,28,313,38); //Botton Newer
       		// Debe dibujar la mission
       		DrawPreviousMissions (plr);

diff --git a/configure.in b/configure.in
@@ -2,7 +2,7 @@ dnl ===========================
 dnl === Initialize autoconf ===
 dnl ===========================
 
-AC_INIT(Race Into Space,0.4.9,[email protected],raceintospace)
+AC_INIT(Race Into Space,1.0.0,[email protected],raceintospace)
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -145,7 +145,7 @@ dnl === Write configuration files ===
 dnl =================================
 
 AC_CONFIG_HEADER(race.h)
-if test -n "$build_win" ; then 
+if test -n "$build_win" ; then
 	AC_CONFIG_FILES(installer.nsi, chmod a-w installer.nsi)
 fi
 AC_CONFIG_FILES(mkrpm raceintospace.spec, chmod a+x mkrpm)

diff --git a/mc2.c b/mc2.c
@@ -366,7 +366,7 @@ void MissionSteps(char plr,int mcode,int Mgoto,int step,int pad)
   if (Mev[step].loc>=20) Mev[step].FName[2]='2';
   if (Mev[step].loc>=30) Mev[step].FName[2]='3';
 
-  if (Mev[step].loc==32) {  // Fix _g special case #48010
+  if (Mev[step].loc==32 || Mev[step].loc==29) {  // Fix _g special case #48010
    Mev[step].FName[2]='0';
    Mev[step].FName[3]='1';
    }

diff --git a/options.c b/options.c
@@ -114,9 +114,7 @@ static struct {
 	{"altasLunar", &options.cheat_altasOnMoon, "%u", 0,
 		"Set to non-zero to enable Altas rockets in lunar missions." },
 	{"succesRDMax", &options.cheat_addMaxS, "%u", 0,
-		"Set to non-zero to make sucessful mission add to R&D max Safety." },
-	{"atlasBoosters", &options.cheat_altasBoosters, "%u", 0,
-		"Set to non-zero to enable Boosters when using Atlas." },
+		"Set to non-zero to make sucessful mission add to R&D max Safety." },
 };
 
 /** prints the minimal usage information to stderr
@@ -394,8 +392,7 @@ setup_options(int argc, char *argv[])
 	options.feat_random_eq=0;
 	options.feat_eq_new_name =0;
 	options.cheat_altasOnMoon=0;
-	options.cheat_addMaxS=0;
-	options.cheat_altasBoosters=0;
+	options.cheat_addMaxS=0;
 
 	fixpath_options();
 

diff --git a/options.h b/options.h
@@ -18,8 +18,7 @@ typedef struct {
     unsigned feat_random_eq;
     unsigned feat_eq_new_name;
     unsigned cheat_altasOnMoon;
-    unsigned cheat_addMaxS;
-    unsigned cheat_altasBoosters;
+    unsigned cheat_addMaxS;
 } game_options;
 
 extern game_options options;

diff --git a/place.c b/place.c
@@ -682,7 +682,7 @@ void writePrestigeFirst(char index) { ///index==plr
 			case 12: i=12;
 			default: break;
 		   }
-		   PrintAt(0,0," (SCD)");
+		   PrintAt(0,0," (2ND)");
 		}
 	  }
 }

diff --git a/vab.c b/vab.c
@@ -886,8 +886,7 @@ void VAB(char plr)
       rk++;
       if (rk>6) rk=0;
       if (((Misdef(mis)>=42 && Misdef(mis)<=57) || (Misdef(mis)>=7 && Misdef(mis)<=13)) && (rk==4 || rk==0))
-        if (options.cheat_altasOnMoon==0) rk++;
-        if (rk==4 && options.cheat_altasBoosters==0) rk++;
+        if (options.cheat_altasOnMoon==0) rk++;
 
 		//display cost (XX of XX)
 		hasDelay=0;

diff --git a/version.c b/version.c
@@ -1 +1 @@
-257
+258