Cronocide/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2025-01-22 11:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure STDCALL/STDCALLPTR is only invoked on x86

Browse Source 
Prevent the code from trying to use stdcall for anything except (32-bit) x86 builds
because it's the only platform it's applicable for.
This commit is contained in:
GravisZro 2024-04-18 13:55:49 -04:00
parent ebc78a6463
commit 9a80863c7f
61 changed files with 78 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/module.h
View File

@ -76,18 +76,25 @@
#define CPPEXTERN extern
#endif
#ifdef _MSC_VER // MSVC Build
# define STDCALL __stdcall
# define STDCALLPTR *STDCALL
#else // Non-MS compilers
# if defined(__i386__) || defined(_X86_) || defined(__THW_INTEL__)
# define STDCALL __attribute__((stdcall))
# else
# define STDCALL
# endif
# define STDCALLPTR STDCALL *
#endif
# define DLLFUNCCALL STDCALL
# define DLLFUNCCALLPTR STDCALLPTR
#ifdef WIN32
//=========================Windows Definition============================
#include "windows.h"
#ifdef _MSC_VER // Visual C++ Build
#define DLLFUNCCALL __stdcall
#define DLLFUNCCALLPTR *DLLFUNCCALL
#else // Non-Visual C++ Build
#define DLLFUNCCALL __attribute__((stdcall))
#define DLLFUNCCALLPTR DLLFUNCCALL *
#endif
#define MODPROCADDRESS FARPROC
#define DLLFUNCEXPORT __declspec(dllexport)
#define DLLFUNCIMPORT __declspec(dllimport)
@ -101,8 +108,6 @@ typedef struct {
#include <dlfcn.h>
#define MODPROCADDRESS void *
#define DLLFUNCCALL __attribute__((stdcall))
#define DLLFUNCCALLPTR DLLFUNCCALL *
#define DLLFUNCEXPORT
#define DLLFUNCIMPORT
#define DLLEXPORT CPPEXTERN
@ -114,8 +119,6 @@ typedef struct {
#elif defined(MACINTOSH)
//==========================Mac Definitions============================
#define MODPROCADDRESS void *
#define DLLFUNCCALL
#define DLLFUNCCALLPTR DLLFUNCCALL *
#define DLLFUNCEXPORT
#define DLLFUNCIMPORT
#define DLLEXPORT
@ -165,4 +168,4 @@ MODPROCADDRESS mod_GetSymbol(module *handle, char *symstr, unsigned char parmbyt
// again, it would return no error
int mod_GetLastError(void);
#endif
#endif

8
scripts/AIGame.cpp
View File

@ -26,13 +26,7 @@
#include "osiris_vector.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/AIGame3.cpp
View File

@ -28,13 +28,7 @@
#include "AIGame3_External.h"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/BatteriesIncluded.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/BossCamera.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/CanyonsCTF.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/CellTestLevel.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/ChrisTest.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/GameGauge.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Geodomes.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/HalfPipe.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/InfernalBolt.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Inversion.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/LEVEL0.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/LEVEL15.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Level12.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Level16.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Level6.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Level9.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/LevelS1.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc02.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc1.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc3.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc4.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc6.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Merc7.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Mysterious_Isle.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/PINBALL.CPP
View File

@ -12,13 +12,7 @@
#include "osiris_common.h"
#include "dallasfuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include <utils/lib_helper.h>
#ifdef __cplusplus
extern "C" {

8
scripts/Paranoia.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/PiccuStation.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Polaris.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Quadsomniac.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/RudeAwakening.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/SewerRat.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/TrainingMission.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/Y2K.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/aigame2.cpp
View File

@ -26,13 +26,7 @@
#include "osiris_vector.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/aigame4.cpp
View File

@ -26,13 +26,7 @@
#include "osiris_vector.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/barney.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

10
scripts/clutter.cpp
View File

@ -25,13 +25,7 @@
#include "osiris_common.h"
#include "osiris_vector.h"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {
@ -632,4 +626,4 @@ short LavaRock::CallEvent(int event, tOSIRISEventInfo *data) {
}
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
}

8
scripts/generic.cpp
View File

@ -25,13 +25,7 @@
#include "osiris_import.h"
#include "osiris_common.h"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/kbLEVEL15.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/kbtest.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level1.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level10.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level11.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level13.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level14.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level17.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level2.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level3.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level4.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level5.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level7.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/level8.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/levelS2.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/merc5.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/myPowerHouse.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

8
scripts/orbital.cpp
View File

@ -30,13 +30,7 @@
#include "osiris_common.h"
#include "DallasFuncs.cpp"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {

10
scripts/scripttest1.cpp
View File

@ -24,13 +24,7 @@
#include "osiris_import.h"
#include "osiris_common.h"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {
@ -264,4 +258,4 @@ short MyDoor::CallEvent(int event, tOSIRISEventInfo *data) {
} break;
};
return CONTINUE_CHAIN | CONTINUE_DEFAULT;
}
}

8
scripts/testscript.cpp
View File

@ -24,13 +24,7 @@
#include "osiris_import.h"
#include "osiris_common.h"
#ifdef _MSC_VER // Visual C++ Build
#define STDCALL __stdcall
#define STDCALLPTR *STDCALL
#else // Non-Visual C++ Build
#define STDCALL __attribute__((stdcall))
#define STDCALLPTR STDCALL *
#endif
#include "module.h"
#ifdef __cplusplus
extern "C" {