thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-01 04:33:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'acs-extern-barriers' into 'master'

Browse source 
Fix ACS extern barriers

See merge request KartKrew/Kart!1159
This commit is contained in:
Sal 2023-04-11 00:59:34 +00:00
commit 660d2f6454
6 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/acs/call-funcs.cpp
View file

@ -16,7 +16,6 @@
#include "acsvm.hpp"
extern "C" {
#include "../doomtype.h"
#include "../doomdef.h"
#include "../doomstat.h"
@ -42,7 +41,6 @@ extern "C" {
#include "../r_skins.h"
#include "../k_battle.h"
#include "../k_podium.h"
}
#include "call-funcs.hpp"

4
src/acs/environment.cpp
View file

@ -16,7 +16,6 @@
#include "acsvm.hpp"
extern "C" {
#include "../doomtype.h"
#include "../doomdef.h"
#include "../doomstat.h"
@ -28,7 +27,6 @@ extern "C" {
#include "../w_wad.h"
#include "../z_zone.h"
#include "../p_local.h"
}
#include "environment.hpp"
#include "thread.hpp"
@ -95,7 +93,7 @@ Environment::Environment()
addCodeDataACS0(120, {"", 0, addCallFunc(CallFunc_PlayerRings)});
addCodeDataACS0(122, {"", 0, addCallFunc(CallFunc_PlayerScore)});
// 136 to 137: Implemented by ACSVM
// 157: Implemented by ACSVM

2
src/acs/interface.cpp
View file

@ -18,7 +18,6 @@
#include "acsvm.hpp"
extern "C" {
#include "interface.h"
#include "../doomtype.h"
@ -29,7 +28,6 @@ extern "C" {
#include "../g_game.h"
#include "../i_system.h"
#include "../p_saveg.h"
}
#include "environment.hpp"
#include "thread.hpp"

7
src/acs/interface.h
View file

@ -18,6 +18,10 @@
#include "../doomdef.h"
#include "../doomstat.h"
#ifdef __cplusplus
extern "C" {
#endif
/*--------------------------------------------------
void ACS_Init(void);
@ -314,5 +318,8 @@ void ACS_Archive(savebuffer_t *save);
void ACS_UnArchive(savebuffer_t *save);
#ifdef __cplusplus
}
#endif
#endif // __SRB2_ACS_INTERFACE_H__

2
src/acs/stream.cpp
View file

@ -18,13 +18,11 @@
#include <ostream>
#include <streambuf>
extern "C" {
#include "../doomtype.h"
#include "../doomdef.h"
#include "../doomstat.h"
#include "../p_saveg.h"
}
#include "stream.hpp"
#include "../cxxutil.hpp"

2
src/acs/thread.hpp
View file

@ -16,7 +16,6 @@
#include "acsvm.hpp"
extern "C" {
#include "../doomtype.h"
#include "../doomdef.h"
#include "../doomstat.h"
@ -24,7 +23,6 @@ extern "C" {
#include "../r_defs.h"
#include "../r_state.h"
#include "../p_spec.h"
}
namespace srb2::acs {