From 66e4995135ff4798c4bb14e85c694c48a21792d6 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 30 Jun 2020 00:12:17 +0200 Subject: [PATCH 1/3] src: Remove unnecessary includes Signed-off-by: Gabriel Ravier --- src/Back.cpp | 5 ----- src/Config.cpp | 1 - src/Draw.cpp | 2 -- src/Game.cpp | 1 - src/Input.cpp | 2 -- src/Main.cpp | 1 - src/Map.cpp | 1 - src/NpChar.cpp | 1 - src/NpChar.h | 1 - src/NpcTbl.cpp | 1 - src/Organya.cpp | 2 -- src/Profile.cpp | 1 - src/Sound.cpp | 1 - src/Sound.h | 2 -- 14 files changed, 22 deletions(-) diff --git a/src/Back.cpp b/src/Back.cpp index 5234400f..7c0b8f34 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -1,17 +1,12 @@ #include "Back.h" -#include #include #include "WindowsWrapper.h" #include "CommonDefines.h" #include "Draw.h" -#include "Frame.h" -#include "Game.h" #include "Main.h" -#include "Map.h" -#include "Stage.h" BACK gBack; int gWaterY; diff --git a/src/Config.cpp b/src/Config.cpp index 4c2d6d69..e37b92a5 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,4 +1,3 @@ -#include #include #include diff --git a/src/Draw.cpp b/src/Draw.cpp index 59aff022..5c7ce42a 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -1,8 +1,6 @@ #include "Draw.h" -#include #include -#include #include #include diff --git a/src/Game.cpp b/src/Game.cpp index f4eaa39f..b09ec22a 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,6 +1,5 @@ #include "Game.h" -#include #include #include diff --git a/src/Input.cpp b/src/Input.cpp index 2776b269..7fa1a9b9 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -1,8 +1,6 @@ #include "Input.h" -#include #include -#include #if defined(_MSC_VER) && _MSC_VER >= 1500 // Newer versions of Visual Studio don't support anything earlier than DirectInput8 #define DIRECTINPUT_VERSION 0x800 diff --git a/src/Main.cpp b/src/Main.cpp index 4332c64e..d5939fd9 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,6 +1,5 @@ #include "Main.h" -#include #include #include diff --git a/src/Map.cpp b/src/Map.cpp index 0657e620..4b85a364 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -1,6 +1,5 @@ #include "Map.h" -#include #include #include #include diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 1c372892..06985e57 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -1,6 +1,5 @@ #include "NpChar.h" -#include #include #include diff --git a/src/NpChar.h b/src/NpChar.h index 0f2f9583..542619ee 100644 --- a/src/NpChar.h +++ b/src/NpChar.h @@ -1,6 +1,5 @@ #pragma once -#include "CommonDefines.h" #include "WindowsWrapper.h" #include "Draw.h" diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index cf37082a..34de4760 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -1,6 +1,5 @@ #include "NpcTbl.h" -#include #include #include diff --git a/src/Organya.cpp b/src/Organya.cpp index f93394e2..43db6f2b 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -6,8 +6,6 @@ #include "Organya.h" -#include -#include #include #include diff --git a/src/Profile.cpp b/src/Profile.cpp index 2b78a369..7388d7fc 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -1,6 +1,5 @@ #include "Profile.h" -#include #include #include diff --git a/src/Sound.cpp b/src/Sound.cpp index c98a3606..9a4e54aa 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -12,7 +12,6 @@ equivalents. #include "Sound.h" -#include #include #include #include diff --git a/src/Sound.h b/src/Sound.h index 46a0e032..d1dc3c40 100644 --- a/src/Sound.h +++ b/src/Sound.h @@ -1,7 +1,5 @@ #pragma once -#include - #ifndef DIRECTSOUND_VERSION #define DIRECTSOUND_VERSION 0x500 #endif From a62141e185c23d4a0bc0e1365b977e71e2006e26 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 30 Jun 2020 01:52:38 +0200 Subject: [PATCH 2/3] src: Added back stddef.h where accurate to get NULL/size_t properly (stdio.h provides them, but it's for file I/O, not essential definitions and types) Signed-off-by: Gabriel Ravier --- src/Back.cpp | 1 + src/Config.cpp | 1 + src/Draw.cpp | 1 + src/Game.cpp | 1 + src/Input.cpp | 1 + src/Main.cpp | 1 + src/Map.cpp | 1 + src/NpChar.cpp | 1 + src/NpcTbl.cpp | 1 + src/Organya.cpp | 1 + src/Profile.cpp | 1 + src/Sound.cpp | 1 + 12 files changed, 12 insertions(+) diff --git a/src/Back.cpp b/src/Back.cpp index 7c0b8f34..c01a448a 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -1,5 +1,6 @@ #include "Back.h" +#include #include #include "WindowsWrapper.h" diff --git a/src/Config.cpp b/src/Config.cpp index e37b92a5..4c2d6d69 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,3 +1,4 @@ +#include #include #include diff --git a/src/Draw.cpp b/src/Draw.cpp index 5c7ce42a..4c30e934 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -1,5 +1,6 @@ #include "Draw.h" +#include #include #include diff --git a/src/Game.cpp b/src/Game.cpp index b09ec22a..f4eaa39f 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -1,5 +1,6 @@ #include "Game.h" +#include #include #include diff --git a/src/Input.cpp b/src/Input.cpp index 7fa1a9b9..86905b6a 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -1,5 +1,6 @@ #include "Input.h" +#include #include #if defined(_MSC_VER) && _MSC_VER >= 1500 // Newer versions of Visual Studio don't support anything earlier than DirectInput8 diff --git a/src/Main.cpp b/src/Main.cpp index d5939fd9..4332c64e 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -1,5 +1,6 @@ #include "Main.h" +#include #include #include diff --git a/src/Map.cpp b/src/Map.cpp index 4b85a364..0657e620 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -1,5 +1,6 @@ #include "Map.h" +#include #include #include #include diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 06985e57..1c372892 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -1,5 +1,6 @@ #include "NpChar.h" +#include #include #include diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp index 34de4760..cf37082a 100644 --- a/src/NpcTbl.cpp +++ b/src/NpcTbl.cpp @@ -1,5 +1,6 @@ #include "NpcTbl.h" +#include #include #include diff --git a/src/Organya.cpp b/src/Organya.cpp index 43db6f2b..101f6b76 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -6,6 +6,7 @@ #include "Organya.h" +#include #include #include diff --git a/src/Profile.cpp b/src/Profile.cpp index 7388d7fc..2b78a369 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -1,5 +1,6 @@ #include "Profile.h" +#include #include #include diff --git a/src/Sound.cpp b/src/Sound.cpp index 9a4e54aa..1ea8e196 100644 --- a/src/Sound.cpp +++ b/src/Sound.cpp @@ -12,6 +12,7 @@ equivalents. #include "Sound.h" +#include #include #include #include From 1bf110269c780f105df4d2f060b1f0f0c9e7b648 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 30 Jun 2020 21:04:35 +0100 Subject: [PATCH 3/3] Correct some constants Have been incorrect since f43a3c1130c423ccb859b903ee13381098277eba --- src/Organya.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Organya.cpp b/src/Organya.cpp index 101f6b76..069d7a59 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -255,7 +255,7 @@ void ChangeOrganPan(unsigned char key, unsigned char pan, signed char track) // if (lpDS == NULL) return; - if (old_key[track] != PANDUMMY) + if (old_key[track] != KEYDUMMY) lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetPan((pan_tbl[pan] - 0x100) * 10); } @@ -264,7 +264,7 @@ void ChangeOrganVolume(int no, long volume, signed char track) // 300がMAXで30 if (lpDS == NULL) return; - if (old_key[track] != VOLDUMMY) + if (old_key[track] != KEYDUMMY) lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]]->SetVolume((volume - 0xFF) * 8); }