* V270

* checked in a bunch of changes to make the build process work in XCode 4 * rewrote C99 in-loop variable declarations ("for (int i = 0; i < n; i++)") in ANSI syntax
raceintospace · Jul 30, 2011 · 09f6d51 · 09f6d51
1 parent 4da5732
commit 09f6d51
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 61 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-29  Will Glynn <[email protected]>
+
+    * V270
+
+    * checked in a bunch of changes to make the build process work in XCode 4
+
+    * rewrote C99 in-loop variable declarations ("for (int i = 0; i < n; i++)") in ANSI syntax
+
 2011-06-28  Pace Willisson  <Pace Willisson <[email protected]>>
 
 	* V269
@@ -46,28 +54,28 @@
 
 	* V265
 
-	* Fixed bug that prevented compiling
-
+	* Fixed bug that prevented compiling
+
 2011-06-11	Nicolas Laplume <[email protected]>
 
 	* V264
 
-	* Make MaxRD improve by 1 with each succesful mission (up to MaxSafety-2)
-
-	* Make MaxRD change back to original MaxRD after catastrophic failures
-
-	* Reduce Safety penalty in no-catastrophic failures to up to 10 (to 0 if "All systems are GO")
-
-	* Fixed bug that awarded duration level if last duration step failed
-
+	* Make MaxRD improve by 1 with each succesful mission (up to MaxSafety-2)
+
+	* Make MaxRD change back to original MaxRD after catastrophic failures
+
+	* Reduce Safety penalty in no-catastrophic failures to up to 10 (to 0 if "All systems are GO")
+
+	* Fixed bug that awarded duration level if last duration step failed
+
 2011-05-26	Nicolas Laplume <[email protected]>
 
 	* V263
 
-	* Change Booster Safety (added advanced option)
-
+	* Change Booster Safety (added advanced option)
+
 	* Changed 'nauts morale for crewmates
-
+
 2011-05-14	Leon Baradat <[email protected]>
 
 	* V262

diff --git a/aipur.c b/aipur.c
@@ -254,7 +254,8 @@ void AIAstroPur(char plr)
 
 //Naut Randomize, Nikakd, 10/8/10
 void AIRandomizeNauts() {
-	for (int i=0;i<106;i++) {
+  int i;
+	for (i=0;i<106;i++) {
 		Men[i].Cap = random(5);
 		Men[i].LM  = random(5);
 		Men[i].EVA = random(5);

diff --git a/ast1.c b/ast1.c
@@ -235,7 +235,8 @@ void DrawAstSel(char plr)
 
 //Naut Randomize, Nikakd, 10/8/10
 void RandomizeNauts() {
-	for (int i=0;i<106;i++) {
+  int i;
+	for (i=0;i<106;i++) {
 		Men[i].Cap = random(5);
 		Men[i].LM  = random(5);
 		Men[i].EVA = random(5);

diff --git a/future.c b/future.c
@@ -1108,7 +1108,8 @@ void Missions(char plr,int X,int Y,int val,char bub)
 	}
 	fclose(MSteps);
 
-	for (int n=2;missStep[n]!='Z';n++)
+  int n;
+	for (n=2;missStep[n]!='Z';n++)
 		switch (missStep[n]) {
 			case 'A': Draw_IJ	(B_Mis(++n));	break;
 			case 'B': Draw_IJV	(B_Mis(++n));	break;

diff --git a/mis_c.c b/mis_c.c
@@ -30,7 +30,7 @@
 #include <av.h>
 #include <mmfile.h>
 #include <utils.h>
-#include <logging.h>
+#include <logging.h>
 #include <options.h>
 
 #include <assert.h>
@@ -1155,7 +1155,8 @@ InRFBox(162,28,312,42,10);
 		      "first cosmonaut to");
 	PrintAt(30,80," walk on the moon?");
 
-	for(int i=0;i<nauts;i++) {
+  int i;
+	for(i=0;i<nauts;i++) {
 		IOBox(25,100 +i*25,135,115+i*25);
 		grSetColor(12);
 		GuyDisp(45,110+i*25, MX[cPad][i].A);
@@ -1225,12 +1226,12 @@ InRFBox(162,28,312,42,10);
 	}
 }
 
-int RocketBoosterSafety(int safetyRocket, int safetyBooster)
-{
-	if (options.boosterSafety==0)
-		return ((safetyRocket * safetyBooster)/100);
-	if (options.boosterSafety==1)
-		return (min(safetyRocket, safetyBooster));
-	else
-		return ((safetyRocket + safetyBooster) /2);
-}
+int RocketBoosterSafety(int safetyRocket, int safetyBooster)
+{
+	if (options.boosterSafety==0)
+		return ((safetyRocket * safetyBooster)/100);
+	if (options.boosterSafety==1)
+		return (min(safetyRocket, safetyBooster));
+	else
+		return ((safetyRocket + safetyBooster) /2);
+}
diff --git a/os_macosx/Info.plist b/os_macosx/Info.plist
@@ -21,23 +21,15 @@
 	<key>CFBundleSignature</key>
 	<string>RiSP</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.6.218</string>
+	<string>1.0.0.270</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.strategy-games</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>SmartCrashReports_CompanyName</key>
-	<string>RaceIntoSpace.org</string>
-	<key>SmartCrashReports_URL</key>
-	<string>http://crash.raceintospace.org/crash/osx/</string>
-	<key>SmartCrashReports_CommentsTemplate</key>
-	<string>Please include your e-mail address if you wish to be contacted in regard to this crash.</string>
 	<key>SUFeedURL</key>
 	<string>http://update.raceintospace.org/appcast/osx/</string>
-	<key>SUScheduledCheckInterval</key>
-	<integer>604800</integer>
-	<key>SUShowReleaseNotes</key>
-	<false/>
 	<key>SUPublicDSAKey</key>
 	<string>
 -----BEGIN PUBLIC KEY-----
@@ -61,5 +53,15 @@ ormrj3pNR7lKQVVKrjy19zFuiIxN1slWaJu6CUAPFrnNmHWbg1GzVE2xJMlTzUmZ
 hIO1NT2CJJt0nh2tebU=
 -----END PUBLIC KEY-----
 	</string>
+	<key>SUScheduledCheckInterval</key>
+	<integer>604800</integer>
+	<key>SUShowReleaseNotes</key>
+	<false/>
+	<key>SmartCrashReports_CommentsTemplate</key>
+	<string>Please include your e-mail address if you wish to be contacted in regard to this crash.</string>
+	<key>SmartCrashReports_CompanyName</key>
+	<string>RaceIntoSpace.org</string>
+	<key>SmartCrashReports_URL</key>
+	<string>http://crash.raceintospace.org/crash/osx/</string>
 </dict>
 </plist>
diff --git a/os_macosx/RaceIntoSpace.xcodeproj/project.pbxproj b/os_macosx/RaceIntoSpace.xcodeproj/project.pbxproj
diff --git a/randomize.c b/randomize.c
@@ -57,7 +57,8 @@ random_min  (int n)
 
 
 void RandomizeEq(void) {
-	for (int i=0; i<2; i++) { //for each player
+  int i;
+	for (i=0; i<2; i++) { //for each player
 		//Satellite
 		Data->P[i].Probe[0].UnitWeight 	= random_number (100,500);
 		Data->P[i].Probe[0].MaxSafety	= random_number (86,98);
@@ -222,18 +223,20 @@ void SetEquipName (char plr) {
 	grSetColor(9);
 	PrintAt(103,59, "EQUIPMENT NAME CHANGE");
 	PrintAt(123,69, "(ESCAPE TO SKIP)");
-	for (int n=0; skip==0 && n<3; n++)
+  int n;
+	for (n=0; skip==0 && n<3; n++)
 		skip = GetNewName(Data->P[plr].Probe[n].Name);
-	for (int n=0; skip==0 && n<7; n++)
+	for (n=0; skip==0 && n<7; n++)
 		skip = GetNewName(Data->P[plr].Manned[n].Name);
-	for (int n=0; skip==0 && n<4; n++)
+	for (n=0; skip==0 && n<4; n++)
 		skip = GetNewName(Data->P[plr].Rocket[n].Name);
 }
 
 
 char GetNewName (char old_name[20]) {
 	char ch=0, num=0, name[20];
-	for(int i=0;i<20;i++) name[i]=0x00;
+  int i;
+	for(i=0;i<20;i++) name[i]=0x00;
 
 	RectFill(100,74,223,91,3);
 	grSetColor(6);PrintAt(162-3*strlen(old_name),80,&old_name[0]);

diff --git a/version.c b/version.c
@@ -1 +1 @@
-269
+270