Starbase commander will always tell you about needing radioactives

fixes #366, from Nic


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@998 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/ChangeLog

@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Commander Hayes explains his predicament before you get the option to 
+  rescue, closes #366, from Nic
 - Gestalt mode accelerates continuously as long as some key is held; 
   should resolve to PC-style input wrt bug #381 - Michael
 - Fixed some more false key cancels, addressing 378 again - Michael

sc2/src/sc2code/comm/comandr/comandr.c

@@ -180,6 +180,8 @@ ByeBye (RESPONSE_REF R)
 	}
 }
 
+static void GiveRadios (RESPONSE_REF R);
+
 static void
 NoRadioactives (RESPONSE_REF R)
 {
@@ -187,9 +189,14 @@ NoRadioactives (RESPONSE_REF R)
 	{
 		NPCPhrase (ABOUT_TIME);
 
+		if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
+			GiveRadios (NULL_PTR);
+		else
+		{
 			Response (i_lied, NoRadioactives);
 			Response (plumb_out, NoRadioactives);
 		}
+	}
 	else
 	{
 		if (PLAYER_SAID (R, where_can_i_get_radios))
@@ -256,6 +263,11 @@ NoRadioactives (RESPONSE_REF R)
 			else
 				Response (need_fuel, NoRadioactives);
 		}
+
+		if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
+			GiveRadios (NULL_PTR);
+		else
+		{
 			Response (ok_i_will_get_radios, ByeBye);
 			if (PHRASE_ENABLED (where_can_i_get_radios))
 			{
@@ -263,6 +275,7 @@ NoRadioactives (RESPONSE_REF R)
 			}
 		}
 	}
+}
 
 static void
 AskAfterRadios (RESPONSE_REF R)
@@ -632,10 +645,6 @@ Intro (void)
 		SET_GAME_STATE (STARBASE_VISITED, 1);
 
 		NPCPhrase (ARE_YOU_SUPPLY_SHIP);
-		if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
-			GiveRadios (NULL_PTR);
-		else
-		{
 		construct_response (
 				shared_phrase_buf,
 				no_but_well_help0,
@@ -648,7 +657,6 @@ Intro (void)
 		Response (what_slave_planet, NoRadioactives);
 	}
 }
-}
 
 static COUNT
 uninit_commander (void)