From 55f1d3a9fe1cfc4fef111fcef5cb8bde8acc8d5f Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 20 Feb 2019 03:55:05 +0000
Subject: [PATCH] Fixed some problems found while compiling most of this with
 VC++2003

I could compile most of this, but not link it (SDL2's .lib files must
be too new).
---
 src/Font.cpp    | 1 -
 src/Game.cpp    | 1 +
 src/Input.cpp   | 1 +
 src/NpChar.cpp  | 5 +++--
 src/Organya.cpp | 1 +
 src/Sound.cpp   | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index a7ee1c2a..442c3446 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -1,6 +1,5 @@
 #include "Font.h"
 
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/Game.cpp b/src/Game.cpp
index f0490ee4..916af633 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -1,6 +1,7 @@
 #include "Game.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #include <SDL_timer.h>
diff --git a/src/Input.cpp b/src/Input.cpp
index ab861da6..405756e3 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -2,6 +2,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <SDL.h>
 
diff --git a/src/NpChar.cpp b/src/NpChar.cpp
index 269802aa..3e204386 100644
--- a/src/NpChar.cpp
+++ b/src/NpChar.cpp
@@ -239,9 +239,10 @@ bool SetBulletObject(int x, int y, int val)
 {
 	int tamakazu_ari[10];
 
+	int n;
 	int t = 0;
 	memset(tamakazu_ari, 0, sizeof(tamakazu_ari));
-	for (int n = 0; n < 8; n++)
+	for (n = 0; n < 8; n++)
 	{
 		int code = gArmsData[n].code;
 		if (code == 5)
@@ -255,7 +256,7 @@ bool SetBulletObject(int x, int y, int val)
 	if (!t)
 		return false;
 
-	int n = Random(1, 10 * t);
+	n = Random(1, 10 * t);
 	int bullet_no = tamakazu_ari[n % t];
 	for (n = 0x100; n < NPC_MAX; n++)
 	{
diff --git a/src/Organya.cpp b/src/Organya.cpp
index b959a5b4..14e9bba7 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -2,6 +2,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 #include <SDL_rwops.h>
 #include <SDL_thread.h>
diff --git a/src/Sound.cpp b/src/Sound.cpp
index 001ad8ac..4ad1610f 100644
--- a/src/Sound.cpp
+++ b/src/Sound.cpp
@@ -1,7 +1,7 @@
 #include "Sound.h"
 
 #include <algorithm>
-#include <math.h>
+#include <cmath>
 #include <stdint.h>
 #include <string>