From 5f57c081541df70b5bcaf0ded4ac151d6abd1d99 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 24 Jan 2019 14:49:25 +0100
Subject: [PATCH] fixed treasure not appearing in freefall/windy in shmup

---
 complex.cpp  | 2 +-
 complex2.cpp | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/complex.cpp b/complex.cpp
index dade0873..4562a618 100644
--- a/complex.cpp
+++ b/complex.cpp
@@ -32,7 +32,7 @@ namespace whirlwind {
     c->item = itNone;
     if(safety) return;
     if(hrand(5000) < PT(100 + 2 * (kills[moAirElemental] + kills[moWindCrow]), 200) && notDippingFor(itWindstone)
-      && getGhostcount() < 2)
+      && (!shmup::on || getGhostcount() < 2))
       c->item = itWindstone;
     else if(hrand(5000) < 20*PRIZEMUL)
       placeLocalOrbs(c);
diff --git a/complex2.cpp b/complex2.cpp
index f9cedf64..b8c21223 100644
--- a/complex2.cpp
+++ b/complex2.cpp
@@ -194,8 +194,7 @@ namespace westwall {
   void switchTreasure(cell *c) {
     c->item = itNone;
     if(safety) return;
-    if(hrand(5000) < PT(100 + 2 * (kills[moAirElemental] + kills[moWindCrow]), 200) && c->landparam >= 5 + items[itWest]
-      && getGhostcount() < 2)
+    if(hrand(5000) < PT(100 + 2 * (kills[moAirElemental] + kills[moWindCrow]), 200) && c->landparam >= 5 + items[itWest])
       c->item = itWest;
     else if(hrand(5000) < 20*PRIZEMUL)
       placeLocalOrbs(c);