From b44037f05a06bbdc2c2c49ca42177ba9ca9ef439 Mon Sep 17 00:00:00 2001
From: onpon4 <onpon4@riseup.net>
Date: Fri, 13 Mar 2015 19:11:14 -0400
Subject: [PATCH] Fixed cash being made available on interceptions in Nightmare
 mode.

---
 src/collectable.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/collectable.cpp b/src/collectable.cpp
index 6f0a336..04645be 100644
--- a/src/collectable.cpp
+++ b/src/collectable.cpp
@@ -77,17 +77,6 @@ void addCollectable(float x, float y, int type, int value, int life)
 	if (value == 0)
 		return; // don't bother!
 
-	/*
-	No cash, powerups, or ammo on interceptions. Stops point leeching(!)
-	*/
-	if ((currentGame.area == MAX_MISSIONS - 1) &&
-		((type == P_CASH) || (type == P_PLASMA_AMMO) || (type == P_ROCKET) ||
-			(type == P_PLASMA_DAMAGE) || (type == P_PLASMA_SHOT) ||
-			(type == P_PLASMA_RATE) || (type == P_SUPER)))
-	{
-		return;
-	}
-
 	// If plasma rate is at max, convert plasma rate powerup to ammo.
 	if (type == P_PLASMA_RATE)
 	{
@@ -146,6 +135,17 @@ void addCollectable(float x, float y, int type, int value, int life)
 		}
 	}
 
+	/*
+	No cash, powerups, or ammo on interceptions. Stops point leeching(!)
+	*/
+	if ((currentGame.area == MAX_MISSIONS - 1) &&
+		((type == P_CASH) || (type == P_PLASMA_AMMO) || (type == P_ROCKET) ||
+			(type == P_PLASMA_DAMAGE) || (type == P_PLASMA_SHOT) ||
+			(type == P_PLASMA_RATE) || (type == P_SUPER)))
+	{
+		return;
+	}
+
 	collectables *collectable = new collectables;
 
 	collectable->next = NULL;