From 2336893e50a436b744dd3f2c0676ba857f1f667e Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 28 Jul 2003 04:43:59 +0000
Subject: [PATCH] Can't ask for resources just before transferring radioactives
 (bug #432), from Nic

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1090 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                          |  2 ++
 sc2/src/sc2code/comm/comandr/comandr.c | 30 +++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 2e7208b50..4768c0244 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,6 @@
 Changes towards version 0.3:
+- Removed a place where you could ask for repairs when you shouldn't 
+  (bug #432), from Nic
 - Can use F10 to quit during splash screen as well as main menu -Michael
 - Fixed starship location when being teleported from Procyon to
   the Earth Starbase after the Precursor bomb is installed. - Svdb
diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c
index 43cad6e33..95232e2ad 100644
--- a/sc2/src/sc2code/comm/comandr/comandr.c
+++ b/sc2/src/sc2code/comm/comandr/comandr.c
@@ -249,25 +249,25 @@ NoRadioactives (RESPONSE_REF R)
 			ClearSemaphore (GraphicsSem);
 		}
 
-		if (GLOBAL_SIS (NumLanders) == 0)
-		{
-			if (GET_GAME_STATE (LANDERS_LOST))
-				Response (i_lost_another_lander, NoRadioactives);
-			else
-				Response (i_lost_my_lander, NoRadioactives);
-		}
-		if (GLOBAL_SIS (FuelOnBoard) < 2 * FUEL_TANK_SCALE)
-		{
-			if (GET_GAME_STATE (GIVEN_FUEL_BEFORE))
-				Response (need_fuel_again, NoRadioactives);
-			else
-				Response (need_fuel, NoRadioactives);
-		}
-
 		if (GLOBAL_SIS (ElementAmounts[RADIOACTIVE]))
 			GiveRadios (NULL_PTR);
 		else
 		{
+			if (GLOBAL_SIS (NumLanders) == 0)
+			{
+				if (GET_GAME_STATE (LANDERS_LOST))
+					Response (i_lost_another_lander, NoRadioactives);
+				else
+					Response (i_lost_my_lander, NoRadioactives);
+			}
+			if (GLOBAL_SIS (FuelOnBoard) < 2 * FUEL_TANK_SCALE)
+			{
+				if (GET_GAME_STATE (GIVEN_FUEL_BEFORE))
+					Response (need_fuel_again, NoRadioactives);
+				else
+					Response (need_fuel, NoRadioactives);
+			}
+	
 			Response (ok_i_will_get_radios, ByeBye);
 			if (PHRASE_ENABLED (where_can_i_get_radios))
 			{