2010-04-13 Krzysztof Kosciuszkiewicz <[email protected]>

	* V235
	* options.h, options.c: add feat_shorter_advanced_training
	* start.c: refactor training code, use feat_shorter_advanced_training
	* data.h: add enum AstronautStatus
	* aipur.c, ast1.c, ast2.c, ast3.c, mis_c.c, mis_m.c, news.c, news_suq.c,
	port.c, records.c, review.c: use AstronautStatus values
	* checkin3: fix Y2K10 bug ;)
	* DEVELOPER: add link to GNU ChangeLog style guide

ChangeLog

@@ -1,68 +1,85 @@
-2010-04-09 Leon Baradat <[email protected]>
+2010-04-13	Krzysztof Kosciuszkiewicz <[email protected]>
+
+	* V235
+
+	* options.h, options.c: add feat_shorter_advanced_training
+
+	* start.c: refactor training code, use feat_shorter_advanced_training
+
+	* data.h: add enum AstronautStatus
+
+	* aipur.c, ast1.c, ast2.c, ast3.c, mis_c.c, mis_m.c, news.c, news_suq.c,
+	port.c, records.c, review.c: use AstronautStatus values
+
+	* checkin3: fix Y2K10 bug ;)
+
+	* DEVELOPER: add link to GNU ChangeLog style guide
+
+2010-04-09	Leon Baradat <[email protected]>
 
 	* V234
 
-	* ast4.c, ast2.c - In capsule/shuttle screen, and Astronaut Complex / Cosmonaut  
+	* ast4.c, ast2.c: In capsule/shuttle screen, and Astronaut Complex / Cosmonaut  
 	Center, the name of a 'naut who's announced retirement now shows in black.  Also 
 	in the 'Naut Complex/Center, the capsule/shuttle program names, and the names of 
 	the Adv. Training programs, are better centered in their respective buttons.  In 
 	the capsule/shuttle screen, MAX DURATION now shows Duration level after the number 
 	of days: e.g., "14 DAYS (LVL E)" for Gemini.
 
-	* ast0.c, ast4.c - Female 'nauts now show in pale purple.  They used to show in  
+	* ast0.c, ast4.c: Female 'nauts now show in pale purple.  They used to show in  
 	that color during recruitment, then in orange in the select list in various 
 	screens (vs. the men in yellow), then in white in the capsule/shuttle window 
 	(indistinguishable from the men).  Now all three show women in pale purple.  Also 
 	in ast0.c, 'nauts who've announced retirement show in purple in the select list in 
 	various screens (black doesn't show well here).  In ast4.c, women who have announced 
 	retirement now show in black.
 
-	* crew.c - In the screen where you assign crews to a mission, the name of a 'naut
+	* crew.c: In the screen where you assign crews to a mission, the name of a 'naut
 	who's announced retirement shows in gray rather than white (black doesn't show 
 	well on a dark blue background).  Also the capsule/shuttle names are better 
 	centered in their respective buttons.
 
-	* museum.c - In Astronaut/Cosmonaut History, now displays female 'nauts in pale 
+	* museum.c: In Astronaut/Cosmonaut History, now displays female 'nauts in pale 
 	purple instead of white.  Also shows "ASTRONAUT COMPLEX" and "COSMONAUT CENTER" 
 	rather than just "COMPLEX" and "CENTER", and rather than just a program name 
 	(e.g., "APOLLO") it now follows that with "PROGRAM" (e.g., "APOLLO PROGRAM").
 
-	* mis_c.c - Shows names of female 'nauts in pale purple rather than white.
+	* mis_c.c: Shows names of female 'nauts in pale purple rather than white.
 
-	* place.c - Shows names of female 'nauts in pale purple rather than yellow.  Also 
+	* place.c: Shows names of female 'nauts in pale purple rather than yellow.  Also 
 	centered YES, NO, and REPLAY MISSION inside their buttons.
 
-	* news_suq.c - Fixed bug in newscast saying that Gemini/Voskhod capsules will cost 
+	* news_suq.c: Fixed bug in newscast saying that Gemini/Voskhod capsules will cost 
 	2MB extra per spacecraft.  A typo had prevented it from having an effect (though 
 	the equivalent newscast for Apollo/Soyuz did work).
 
-	* budget.c - Shows Duration level of Duration missions, and some better centerings.
+	* budget.c: Shows Duration level of Duration missions, and some better centerings.
 
-	* admin.c - Fixed typo "ENOUGHT".
+	* admin.c: Fixed typo "ENOUGHT".
 
-	* radar.c - Male 'nauts who have announced retirement now show in black, while women 
+	* radar.c: Male 'nauts who have announced retirement now show in black, while women 
 	who've announced retirement now show in purple.  Also better centering of some text.
 
-	* newmis.c - Was displaying two spaces between month and year.  Also better centering 
+	* newmis.c: Was displaying two spaces between month and year.  Also better centering 
 	of "SINGLE LAUNCH" and "JOINT LAUNCH".
 
-	* port.c - Changed it to add a question mark to "QUIT" "ARE YOU SURE" YES/NO.
+	* port.c: Changed it to add a question mark to "QUIT" "ARE YOU SURE" YES/NO.
 
-	* rdplex.c - Better centering of text in the "PURCHASE EQUIPMENT" and 
+	* rdplex.c: Better centering of text in the "PURCHASE EQUIPMENT" and 
 	"R&D xx% IMPROVEMENT" buttons in R&D and Purchasing screens.
 
-	* prefs.c - Better centering of "COUNTRY" in the preferences screen.
+	* prefs.c: Better centering of "COUNTRY" in the preferences screen.
 
-	* ast1.c - Better centering of text in confirmation box for recruiting 'nauts.
+	* ast1.c: Better centering of text in confirmation box for recruiting 'nauts.
 
-	* ast3.c - Better centering of ASTRO/COSMONAUT SELECTION and ASTRO/COSMONAUTS IN TRAINING.
+	* ast3.c: Better centering of ASTRO/COSMONAUT SELECTION and ASTRO/COSMONAUTS IN TRAINING.
 
-	* intel.c - Better centering of "CONTINUE" in its button.
+	* intel.c: Better centering of "CONTINUE" in its button.
 
-	* news.c - Small esthetic changes, including making Svetlana say the same thing in print
+	* news.c: Small esthetic changes, including making Svetlana say the same thing in print
 	that she says vocally at the end of her newscast.
 
-2010-03-14 Leon Baradat <[email protected]>
+2010-03-14	Leon Baradat <[email protected]>
 
 	* V233
 
@@ -71,45 +88,45 @@
 	landing).  In rush.c, also fixed a bug that continued to show the Duration level of 
 	the original mission after it had been downgraded to remove the Duration step(s).
 
-	* radar.c - Now shows the crew number, e.g., "(CREW III)" above the names of the 
+	* radar.c: Now shows the crew number, e.g., "(CREW III)" above the names of the 
 	crew members in the launch pad screen.  Also fixed a tiny bug that displayed duration 
 	level on scrubbed missions--and on missions that had been downgraded to remove the 
 	duration step.  I noticed this bug when I found the bug above.
 
-	* crew.c - Added duration level to the screen where you assign crews to a mission.
+	* crew.c: Added duration level to the screen where you assign crews to a mission.
 
-	* crew.c, future.c - Changed them from showing "PAD: 1", 2, or 3 to "PAD: A", B, or C.
+	* crew.c, future.c: Changed them from showing "PAD: 1", 2, or 3 to "PAD: A", B, or C.
 
-	* ast3.c - Fixed typo "CEMETARY".
+	* ast3.c: Fixed typo "CEMETARY".
 
-	* records.h, main.c, museum.c - Esthetic changes.
+	* records.h, main.c, museum.c: Esthetic changes.
 
-	* crew.dat, men.dat, user.dat - Updates to the 'naut roster.
+	* crew.dat, men.dat, user.dat: Updates to the 'naut roster.
 
-2010-02-27 Leon Baradat <[email protected]>
+2010-02-27	Leon Baradat <[email protected]>
 
 	* V232
 
 	* admin.c, newmis.c, rush.c, vab.c: These windows now show the Duration level of a 
 	Duration mission, e.g.: ORBITAL-EX (B) instead of just ORBITAL-EX.
 
-2010-02-22 Leon Baradat <[email protected]>
+2010-02-22	Leon Baradat <[email protected]>
 
 	* V231
 
 	* crew.c: When you're assigning crews to a mission, the crew members now display a 
 		  morale box next to them so you can see at a glance how your available 
 		  crews are doing morale-wise.
 
-2010-02-21 Leon Baradat <[email protected]>
+2010-02-21	Leon Baradat <[email protected]>
 
 	* V230
 
 	* vab.c: When you click AUTOPURCHASE in VAB/VIB, it now updates the amount of cash
 		 the player has (i.e., it acknowledges that a purchase has been made). 
 		 Also a few tiny changes to make things slightly better centered.
 
-2010-02-20 Leon Baradat <[email protected]>
+2010-02-20	Leon Baradat <[email protected]>
 
 	* V229
 
@@ -126,7 +143,7 @@
 	* radar.c: Corrected change I uploaded accidentally earlier today--set this file 
 		   back the way it was before
 
-2010-02-20 Leon Baradat <[email protected]>
+2010-02-20	Leon Baradat <[email protected]>
 
 	* V228
 
@@ -141,13 +158,13 @@
 		      SCHLICKBERND with SHIBORIN and FARGOV with DOLGOV, rather than 
 		      SCHLICKBERND with DOLGOV and FARGOV with SHIBORIN
 
-2010-02-15 Leon Baradat <[email protected]>
+2010-02-15	Leon Baradat <[email protected]>
 
 	* V227
 
 	* rdplex.c: now displays the season and year
 
-2010-02-09/10 Leon Baradat <[email protected]>
+2010-02-09	Leon Baradat <[email protected]>
 
 	* V226
 

DEVELOPER

@@ -96,9 +96,10 @@ THIS SECTION (Making RPMs) NEEDS UPDATING
 7. CVS Commiting
 
     1) write the new code
-    2) update ChangeLog
+    2) update ChangeLog - make sure the GNU format is followed
+       http://www.gnu.org/prep/standards/html_node/Change-Logs.html
     3) run "make clean && make" to check for errors
-    4) update version.c - adding one to the current versionnumber
+    4) update version.c - adding one to the current version number
     5) call "./checkin3" which will guide you through the actual commit
 
 \endverbatim

aipur.c

@@ -307,7 +307,7 @@ void SelectBest(char plr,int pos)
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].EVA=Men[AIsel[i]].EVA;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Docking=Men[AIsel[i]].Docking;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Endurance=Men[AIsel[i]].Endurance;
-	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Status=0;
+	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Status=AST_ST_ACTIVE;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].oldAssign=-1;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].TrainingLevel=1;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Group=Data->P[plr].AstroLevel;
@@ -337,7 +337,8 @@ void SelectBest(char plr,int pos)
 	  };
    // remove from the bottom up out of training
    for(i=0;i<Data->P[plr].AstroCount;i++)
-	 if (Data->P[plr].Pool[i].Status==4) Data->P[plr].Pool[i].Status=0;
+	 if (Data->P[plr].Pool[i].Status==AST_ST_TRAIN_BASIC_1)
+         Data->P[plr].Pool[i].Status=AST_ST_ACTIVE;
  return;
 }
 
@@ -367,7 +368,7 @@ char Skill(char plr,char type)
  char m,hgh=0,tst,ind=0;
  for (m=0;m<Data->P[plr].AstroCount;m++)
    {
-	if (Data->P[plr].Pool[m].Status==0 && Data->P[plr].Pool[m].Assign==0 && Data->P[plr].Pool[m].Prime<1)
+	if (Data->P[plr].Pool[m].Status==AST_ST_ACTIVE && Data->P[plr].Pool[m].Assign==0 && Data->P[plr].Pool[m].Prime<1)
 	  {
 	   tst=0;
 	   switch(type)
@@ -401,9 +402,9 @@ void TransAstro(char plr,int inx)
  for (i=0;i<Data->P[plr].AstroCount;i++)
     {
      Data->P[plr].Pool[i].Mood=100;
-     if (Data->P[plr].Pool[i].Status==1 || Data->P[plr].Pool[i].Status==2)
+     if (Data->P[plr].Pool[i].Status==AST_ST_RETIRED || Data->P[plr].Pool[i].Status==AST_ST_DEAD)
       {
-       Data->P[plr].Pool[i].Status=0;
+       Data->P[plr].Pool[i].Status=AST_ST_ACTIVE;
        Data->P[plr].Pool[i].Assign=0;
        Data->P[plr].Pool[i].Una=0;
        Data->P[plr].Pool[i].Prime=0;
@@ -412,7 +413,7 @@ void TransAstro(char plr,int inx)
       }
      Data->P[plr].Pool[i].RetReas=0;
      Data->P[plr].Pool[i].Hero=0; //clear hero flag
-   if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0 && Data->P[plr].Pool[i].Prime<1)
+   if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0 && Data->P[plr].Pool[i].Prime<1)
 	 ++count;
     }
  if (count<max*2) {CheckAdv(plr);return;}
@@ -431,7 +432,7 @@ void TransAstro(char plr,int inx)
 	   w=0;found=0;
 	   while (w < Data->P[plr].AstroCount && found==0)
 		 {
-		  if (Data->P[plr].Pool[w].Status==0 && Data->P[plr].Pool[w].Assign==0 && Data->P[plr].Pool[w].Prime<1)
+		  if (Data->P[plr].Pool[w].Status==AST_ST_ACTIVE && Data->P[plr].Pool[w].Assign==0 && Data->P[plr].Pool[w].Prime<1)
 			{
 			 // based on [j] an program and position pick best skill
 			 switch(inx)
@@ -485,19 +486,19 @@ void CheckAdv(char plr)
  int i,count;
  count=0;
  for (i=0;i<Data->P[plr].AstroCount;i++)
-   if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0)
+   if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0)
 	 ++count;
  if (count<=3)
    {
 	for (i=0;i<Data->P[plr].AstroCount;i++)
-	   if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0)
+	   if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0)
 	 {
 	  Data->P[plr].Pool[i].Focus=random(4)+1;
 	  if (Data->P[plr].Pool[i].Focus>0)
 	   {
 		Data->P[plr].Cash-=3;
 		Data->P[plr].Pool[i].Assign=0;
-		Data->P[plr].Pool[i].Status=7;
+		Data->P[plr].Pool[i].Status=AST_ST_TRAIN_ADV_1;
 	   }
 	 }
    }
@@ -516,7 +517,7 @@ void RemoveUnhappy(char plr)
 	for (i=0;i<Data->P[plr].AstroCount;i++)
 	{
 		if (Data->P[plr].Pool[i].Mood < ASTRONAUT_MOOD_THRESHOLD)
-			if (Data->P[plr].Pool[i].Assign!=0 && Data->P[plr].Pool[i].Status==0)
+			if (Data->P[plr].Pool[i].Assign!=0 && Data->P[plr].Pool[i].Status==AST_ST_ACTIVE)
 			{
 				Data->P[plr].Pool[i].Assign=0; // back to limbo
 				Data->P[plr].Pool[i].Una=0;

ast1.c

@@ -618,7 +618,7 @@ DrawAstCheck(plr);
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].EVA=Men[sel[i]].EVA;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Docking=Men[sel[i]].Docking;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Endurance=Men[sel[i]].Endurance;
-	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Status=4;
+	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Status=AST_ST_TRAIN_BASIC_1;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].TrainingLevel=1;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].Group=Data->P[plr].AstroLevel;
 	   Data->P[plr].Pool[i+Data->P[plr].AstroCount].CR=random(2)+1;

ast2.c

@@ -123,7 +123,7 @@ void Limbo(char plr)
   now2=BarA=count=0;
   ShBox(26,130+BarA*8,152,138+BarA*8);
   for (i=0;i<Data->P[plr].AstroCount;i++)
-  if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0) {
+  if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0) {
 	  M[count++]=i;
   };
   DispLeft(plr,BarA,count,now2,&M[0]);
@@ -333,7 +333,7 @@ void Limbo(char plr)
 	now2=BarA=count=0;
 	 ShBox(26,130+BarA*8,152,138+BarA*8);
 	 for (i=0;i<Data->P[plr].AstroCount;i++)
-	    if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0)
+	    if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0)
 	       M[count++]=i;
 	 DispLeft(plr,BarA,count,now2,&M[0]);
 	 if (count>0) LimboText(plr,M[now2]);
@@ -354,7 +354,7 @@ void Limbo(char plr)
    if (Data->P[plr].Pool[M[now2]].TrainingLevel>6) Help("i120");
    else if (Data->P[plr].Cash<3) Help("i121");
    else {
-		 Data->P[plr].Pool[M[now2]].Status=7;
+		 Data->P[plr].Pool[M[now2]].Status=AST_ST_TRAIN_ADV_1;
 	    Data->P[plr].Cash-=3;
 	    Data->P[plr].Pool[M[now2]].Focus=i+1;
 		 Data->P[plr].Pool[M[now2]].Assign=0;
@@ -393,7 +393,7 @@ void Limbo(char plr)
 	now2=BarA=count=0;
 	 ShBox(26,130+BarA*8,152,138+BarA*8);
 	 for (i=0;i<Data->P[plr].AstroCount;i++)
-	    if (Data->P[plr].Pool[i].Status==0 && Data->P[plr].Pool[i].Assign==0)
+	    if (Data->P[plr].Pool[i].Status==AST_ST_ACTIVE && Data->P[plr].Pool[i].Assign==0)
 	       M[count++]=i;
 	 DispLeft(plr,BarA,count,now2,&M[0]);
 	 if (count>0) LimboText(plr,M[now2]);