If you withdraw from Adv I or II, you can send 'naut to Advanced agai…

…n later

ChangeLog

@@ -1,3 +1,10 @@
+2012-04-25  Leon Baradat <[email protected]>
+
+	* V280
+
+	* ast2.c, ast3.c: If you withdraw someone from Advanced I or II, you can send them to Advanced 
+			  training again later
+
 2012-04-19  Leon Baradat <[email protected]>
 
 	* V279

ast2.c

@@ -425,7 +425,7 @@ void Limbo(char plr)
 void Clear(void)
 {
  RectFill(44,31,145,40,3);RectFill(49,112,60,119,3);
- RectFill(123,62,145,77,3);RectFill(128,79,145,92,3);
+ RectFill(123,62,145,77,3);RectFill(125,79,145,85,3);RectFill(128,86,145,93,3);
  RectFill(123,95,145,101,3);RectFill(127,113,141,120,3);
  RectFill(130,54,155,61,3);     
  return;

ast3.c

@@ -406,7 +406,10 @@ void Train(char plr,int level)
 	      if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_1) Data->P[plr].Cash+=3; // refunds
 	      if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_2) Data->P[plr].Cash+=2; // for early
 	      if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_3) Data->P[plr].Cash+=1; // withdrawal
-	      Data->P[plr].Pool[M[now2]].TrainingLevel=Data->P[plr].Pool[M[now2]].Status;
+	      if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_1 || Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_2)
+		{ Data->P[plr].Pool[M[now2]].TrainingLevel=0; }
+		else
+		{ Data->P[plr].Pool[M[now2]].TrainingLevel=Data->P[plr].Pool[M[now2]].Status; }
 	      Data->P[plr].Pool[M[now2]].Status=AST_ST_ACTIVE;
 	      Data->P[plr].Pool[M[now2]].Assign=0;
 	      if (Data->P[plr].Pool[M[now2]].Cap<0) Data->P[plr].Pool[M[now2]].Cap=0;

version.c

@@ -1 +1 @@
-279
+280