Merge branch 'fix-acs-includes' into 'master'

Fix ACS includes

See merge request KartKrew/Kart!963

src/acs/call-funcs.cpp

@@ -11,6 +11,20 @@
 /// \file  call-funcs.cpp
 /// \brief Action Code Script: CallFunc instructions
 
+#include <algorithm>
+#include <cctype>
+
+#include <ACSVM/Code.hpp>
+#include <ACSVM/CodeData.hpp>
+#include <ACSVM/Environment.hpp>
+#include <ACSVM/Error.hpp>
+#include <ACSVM/Module.hpp>
+#include <ACSVM/Scope.hpp>
+#include <ACSVM/Script.hpp>
+#include <ACSVM/Serial.hpp>
+#include <ACSVM/Thread.hpp>
+#include <Util/Floats.hpp>
+
 extern "C" {
 #include "../doomtype.h"
 #include "../doomdef.h"
@@ -38,17 +52,6 @@ extern "C" {
 #include "../k_battle.h"
 }
 
-#include <ACSVM/Code.hpp>
-#include <ACSVM/CodeData.hpp>
-#include <ACSVM/Environment.hpp>
-#include <ACSVM/Error.hpp>
-#include <ACSVM/Module.hpp>
-#include <ACSVM/Scope.hpp>
-#include <ACSVM/Script.hpp>
-#include <ACSVM/Serial.hpp>
-#include <ACSVM/Thread.hpp>
-#include <Util/Floats.hpp>
-
 #include "call-funcs.hpp"
 
 #include "environment.hpp"

src/acs/environment.cpp

@@ -11,6 +11,20 @@
 /// \file  environment.cpp
 /// \brief Action Code Script: Environment definition
 
+#include <algorithm>
+#include <vector>
+
+#include <ACSVM/Code.hpp>
+#include <ACSVM/CodeData.hpp>
+#include <ACSVM/Environment.hpp>
+#include <ACSVM/Error.hpp>
+#include <ACSVM/Module.hpp>
+#include <ACSVM/Scope.hpp>
+#include <ACSVM/Script.hpp>
+#include <ACSVM/Serial.hpp>
+#include <ACSVM/Thread.hpp>
+#include <Util/Floats.hpp>
+
 extern "C" {
 #include "../doomtype.h"
 #include "../doomdef.h"
@@ -24,17 +38,6 @@ extern "C" {
 #include "../z_zone.h"
 }
 
-#include <ACSVM/Code.hpp>
-#include <ACSVM/CodeData.hpp>
-#include <ACSVM/Environment.hpp>
-#include <ACSVM/Error.hpp>
-#include <ACSVM/Module.hpp>
-#include <ACSVM/Scope.hpp>
-#include <ACSVM/Script.hpp>
-#include <ACSVM/Serial.hpp>
-#include <ACSVM/Thread.hpp>
-#include <Util/Floats.hpp>
-
 #include "environment.hpp"
 #include "thread.hpp"
 #include "call-funcs.hpp"

src/acs/interface.cpp

@@ -11,21 +11,10 @@
 /// \file  interface.cpp
 /// \brief Action Code Script: Interface for the rest of SRB2's game logic
 
-extern "C" {
-#include "interface.h"
-
-#include "../doomtype.h"
-#include "../doomdef.h"
-#include "../doomstat.h"
-
-#include "../r_defs.h"
-#include "../g_game.h"
-#include "../i_system.h"
-#include "../p_saveg.h"
-}
-
-#include <cmath>
-#include <memory>
+#include <cstddef>
+#include <istream>
+#include <ostream>
+#include <vector>
 
 #include <ACSVM/Action.hpp>
 #include <ACSVM/Code.hpp>
@@ -39,6 +28,19 @@ extern "C" {
 #include <ACSVM/Thread.hpp>
 #include <Util/Floats.hpp>
 
+extern "C" {
+#include "interface.h"
+
+#include "../doomtype.h"
+#include "../doomdef.h"
+#include "../doomstat.h"
+
+#include "../r_defs.h"
+#include "../g_game.h"
+#include "../i_system.h"
+#include "../p_saveg.h"
+}
+
 #include "environment.hpp"
 #include "thread.hpp"
 #include "stream.hpp"

src/acs/stream.cpp

@@ -14,6 +14,10 @@
 
 // TODO? Maybe untie this file from ACS?
 
+#include <istream>
+#include <ostream>
+#include <streambuf>
+
 extern "C" {
 #include "../doomtype.h"
 #include "../doomdef.h"
@@ -25,10 +29,6 @@ extern "C" {
 #include "stream.hpp"
 #include "../cxxutil.hpp"
 
-#include <istream>
-#include <ostream>
-#include <streambuf>
-
 using namespace srb2::acs;
 
 SaveBuffer::SaveBuffer(savebuffer_t *save_) :

src/acs/stream.hpp

@@ -17,12 +17,7 @@
 #ifndef __SRB2_ACS_STREAM_HPP__
 #define __SRB2_ACS_STREAM_HPP__
 
-extern "C" {
-#include "../doomtype.h"
-#include "../doomdef.h"
-#include "../doomstat.h"
-#include "../p_saveg.h"
-}
+#include <streambuf>
 
 #include <ACSVM/Code.hpp>
 #include <ACSVM/CodeData.hpp>
@@ -35,9 +30,12 @@ extern "C" {
 #include <ACSVM/Thread.hpp>
 #include <Util/Floats.hpp>
 
-#include <istream>
-#include <ostream>
-#include <streambuf>
+extern "C" {
+#include "../doomtype.h"
+#include "../doomdef.h"
+#include "../doomstat.h"
+#include "../p_saveg.h"
+}
 
 namespace srb2::acs {
 

src/acs/thread.cpp

@@ -11,6 +11,18 @@
 /// \file  thread.cpp
 /// \brief Action Code Script: Thread definition
 
+#include <ACSVM/Code.hpp>
+#include <ACSVM/CodeData.hpp>
+#include <ACSVM/Environment.hpp>
+#include <ACSVM/Error.hpp>
+#include <ACSVM/Module.hpp>
+#include <ACSVM/Scope.hpp>
+#include <ACSVM/Script.hpp>
+#include <ACSVM/Serial.hpp>
+#include <ACSVM/Thread.hpp>
+#include <ACSVM/BinaryIO.hpp>
+#include <Util/Floats.hpp>
+
 #include "thread.hpp"
 
 extern "C" {
@@ -26,18 +38,6 @@ extern "C" {
 #include "../p_polyobj.h"
 }
 
-#include <ACSVM/Code.hpp>
-#include <ACSVM/CodeData.hpp>
-#include <ACSVM/Environment.hpp>
-#include <ACSVM/Error.hpp>
-#include <ACSVM/Module.hpp>
-#include <ACSVM/Scope.hpp>
-#include <ACSVM/Script.hpp>
-#include <ACSVM/Serial.hpp>
-#include <ACSVM/Thread.hpp>
-#include <ACSVM/BinaryIO.hpp>
-#include <Util/Floats.hpp>
-
 using namespace srb2::acs;
 
 void Thread::start(

src/acs/thread.hpp

@@ -14,16 +14,6 @@
 #ifndef __SRB2_ACS_THREAD_HPP__
 #define __SRB2_ACS_THREAD_HPP__
 
-extern "C" {
-#include "../doomtype.h"
-#include "../doomdef.h"
-#include "../doomstat.h"
-#include "../p_tick.h"
-#include "../r_defs.h"
-#include "../r_state.h"
-#include "../p_spec.h"
-}
-
 #include <ACSVM/Code.hpp>
 #include <ACSVM/CodeData.hpp>
 #include <ACSVM/Environment.hpp>
@@ -35,6 +25,16 @@ extern "C" {
 #include <ACSVM/Thread.hpp>
 #include <Util/Floats.hpp>
 
+extern "C" {
+#include "../doomtype.h"
+#include "../doomdef.h"
+#include "../doomstat.h"
+#include "../p_tick.h"
+#include "../r_defs.h"
+#include "../r_state.h"
+#include "../p_spec.h"
+}
+
 
 namespace srb2::acs {