From e459364a33054107d5a74800e90a94f4809cae5b Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Tue, 7 Jan 2020 21:58:35 +0000
Subject: [PATCH] More-accurate Shoot.cpp variable arrangement

---
 src/Shoot.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Shoot.cpp b/src/Shoot.cpp
index 3b2a639e..64bf7788 100644
--- a/src/Shoot.cpp
+++ b/src/Shoot.cpp
@@ -11,7 +11,6 @@
 #include "Sound.h"
 
 int empty;
-int spur_charge;
 
 void ShootBullet_Frontia1(int level)
 {
@@ -250,6 +249,7 @@ void ShootBullet_FireBall(int level)
 void ShootBullet_Machinegun1(int level)
 {
 	int bul_no;
+	static int wait;
 
 	if (CountArmsBullet(4) > 4)
 		return;
@@ -355,7 +355,6 @@ void ShootBullet_Machinegun1(int level)
 	}
 	else
 	{
-		static int wait = 0;
 		++wait;
 
 		if (gMC.equip & 8)
@@ -896,6 +895,8 @@ void ShootBullet_Nemesis(int level)
 	}
 }
 
+int spur_charge;
+
 void ResetSpurCharge(void)
 {
 	spur_charge = 0;
@@ -906,9 +907,9 @@ void ResetSpurCharge(void)
 
 void ShootBullet_Spur(int level)
 {
-	static BOOL bMax;
-	BOOL bShot;
 	int bul_no;
+	BOOL bShot;
+	static BOOL bMax;
 
 	bShot = FALSE;
 
@@ -1058,11 +1059,12 @@ void ShootBullet_Spur(int level)
 
 void ShootBullet(void)
 {
+	static int soft_rensha;	// 'rensha' is Japanese for 'rapid-fire', apparently
+
 	if (empty != 0)
 		--empty;
 
 	// Only let the player shoot every 4 frames
-	static int soft_rensha;	// 'rensha' is Japanese for 'rapid-fire', apparently
 	if (soft_rensha != 0)
 		--soft_rensha;