From dcf99214813780aee08b5d1612d22cb2ac5b95dc Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 4 Sep 2019 02:23:49 +0100
Subject: [PATCH 1/3] Move SystemTask from WindowsWrapper.h to Main.h

---
 src/Draw.cpp         | 1 +
 src/Main.h           | 2 ++
 src/WindowsWrapper.h | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Draw.cpp b/src/Draw.cpp
index 4add7b70..96b671fd 100644
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -12,6 +12,7 @@
 #include "Ending.h"
 #include "Generic.h"
 #include "MapName.h"
+#include "Main.h"
 #include "Tags.h"
 #include "TextScr.h"
 
diff --git a/src/Main.h b/src/Main.h
index 745bde86..09b3e5aa 100644
--- a/src/Main.h
+++ b/src/Main.h
@@ -7,3 +7,5 @@ extern BOOL bFullscreen;
 
 void PutFramePerSecound(void);
 unsigned long GetFramePerSecound(void);
+
+BOOL SystemTask(void);
diff --git a/src/WindowsWrapper.h b/src/WindowsWrapper.h
index 820ee531..e48f8dd1 100644
--- a/src/WindowsWrapper.h
+++ b/src/WindowsWrapper.h
@@ -11,5 +11,3 @@
 	rect.top = t; \
 	rect.right = r; \
 	rect.bottom = b;
-
-BOOL SystemTask();

From 7a5eb3993c0663b382d51a9ae8723ed43ca6f538 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 4 Sep 2019 13:57:22 +0000
Subject: [PATCH 2/3] Remove some FIX_BUGS things that aren't actually bugs

Code cleanup isn't within the scope of the project.
---
 src/Organya.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Organya.cpp b/src/Organya.cpp
index 8cb76e3c..1a85c9a1 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -490,9 +490,7 @@ void OrgData::InitOrgData(void)
 // 曲情報を設定。flagはアイテムを指定 (Set song information. flag specifies an item)
 BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
 {
-#ifndef FIX_BUGS	// Leftover debug junk
-	char str[32];
-#endif
+	char str[32];	// Leftover debug junk
 	int i;
 
 	if (flag & SETGRID)	// グリッドを有効に (Enable grid)
@@ -504,9 +502,7 @@ BOOL OrgData::SetMusicInfo(MUSICINFO *mi, unsigned long flag)
 	if (flag & SETWAIT)
 	{
 		info.wait = mi->wait;
-#ifndef FIX_BUGS
-		itoa(mi->wait, str, 10);
-#endif
+		itoa(mi->wait, str, 10);	// Leftover debug junk
 	}
 
 	if (flag & SETREPEAT)
@@ -720,14 +716,13 @@ BOOL OrgData::InitMusicData(const char *path)
 	// データを有効に (Enable data)
 	for (j = 0; j < MAXMELODY; j++)
 		MakeOrganyaWave(j,info.tdata[j].wave_no, info.tdata[j].pipi);
-#ifndef FIX_BUGS
+
 	// Pixel ripped out some code so he could use PixTone sounds as drums, but he left this dead code
 	for (j = MAXMELODY; j < MAXTRACK; j++)
 	{
 		i = info.tdata[j].wave_no;
 		//InitDramObject(dram_name[i], j - MAXMELODY);
 	}
-#endif
 
 	SetPlayPointer(0);	// 頭出し (Cue)
 

From 3a40e9eb363b8c8955f79f15b982f5cb13c6dc3b Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 4 Sep 2019 14:01:51 +0000
Subject: [PATCH 3/3] Add .exe file extensions to the Makefile

32-bit MinGW-w64 has this stupid thing where the Makefile can't
detect that executable depedencies may end with '.exe', causing it to
regenerate them every time it's ran.
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 288bdcd1..6d1229c2 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,12 @@ ASSETS_DIRECTORY = assets
 ifeq ($(RELEASE), 1)
 	CXXFLAGS = -O3
 	LDFLAGS = -s
-	FILENAME_DEF = CSE2
-	DOCONFIG_FILENAME_DEF = DoConfig
+	FILENAME_DEF = CSE2.exe
+	DOCONFIG_FILENAME_DEF = DoConfig.exe
 else
 	CXXFLAGS = -Og -ggdb3
-	FILENAME_DEF = CSE2_debug
-	DOCONFIG_FILENAME_DEF = DoConfig_debug
+	FILENAME_DEF = CSE2_debug.exe
+	DOCONFIG_FILENAME_DEF = DoConfig_debug.exe
 endif
 
 ifeq ($(JAPANESE), 1)