diff --git a/2dlib/gr.h b/2dlib/gr.h index 9f68eee6..63e868f7 100644 --- a/2dlib/gr.h +++ b/2dlib/gr.h @@ -377,9 +377,9 @@ public: class grHardwareSurface final : public grSurface { public: - grHardwareSurface(); + grHardwareSurface() = default; grHardwareSurface(int w, int h, int bpp, unsigned flags = 0, const char *name = NULL); - virtual ~grHardwareSurface(); + virtual ~grHardwareSurface() = default; bool create(int w, int h, int bpp, unsigned flags = 0, const char *name = NULL); }; @@ -395,7 +395,7 @@ class grScreen final : public grSurface { public: grScreen(int w, int h, int bpp, const char *name = NULL); - virtual ~grScreen(); + virtual ~grScreen() = default; void flip(); }; diff --git a/2dlib/hardsurf.cpp b/2dlib/hardsurf.cpp index 16f4aeaa..f93d8f1f 100644 --- a/2dlib/hardsurf.cpp +++ b/2dlib/hardsurf.cpp @@ -42,13 +42,9 @@ // constructor and destructor // ---------------------------------------------------------------------------- -grHardwareSurface::grHardwareSurface() : grSurface() {} - grHardwareSurface::grHardwareSurface(int w, int h, int bpp, unsigned flags, const char *name) : grSurface(w, h, bpp, SURFTYPE_GENERIC, flags, name) {} -grHardwareSurface::~grHardwareSurface() {} - // ---------------------------------------------------------------------------- // initialize a hardware surface with these values // ---------------------------------------------------------------------------- diff --git a/2dlib/screen.cpp b/2dlib/screen.cpp index 279505c1..82a40f06 100644 --- a/2dlib/screen.cpp +++ b/2dlib/screen.cpp @@ -56,8 +56,6 @@ grScreen::grScreen(int w, int h, int bpp, const char *name) : grSurface(w, h, bpp, SURFTYPE_VIDEOSCREEN, SURFFLAG_BACKBUFFER, name) {} -grScreen::~grScreen() {} - // --------------------------------------------------------------------------- // screen refresh routines // --------------------------------------------------------------------------- diff --git a/AudioEncode/adecode.h b/AudioEncode/adecode.h index 0b858cc2..2ffd3107 100644 --- a/AudioEncode/adecode.h +++ b/AudioEncode/adecode.h @@ -25,7 +25,7 @@ namespace AudioDecoder { class IAudioDecoder { public: - virtual ~IAudioDecoder() {} + virtual ~IAudioDecoder() = default; // Read data from the audio decoder. // pBuffer: The buffer to receive the data from diff --git a/editor/DallasMainDlg.cpp b/editor/DallasMainDlg.cpp index f4174184..a6a8d8bb 100644 --- a/editor/DallasMainDlg.cpp +++ b/editor/DallasMainDlg.cpp @@ -9693,8 +9693,7 @@ int CDallasMainDlg::CreateScriptFile(char *filename) { O(("")); O(("class BaseScript {")); O(("public:")); - O((" BaseScript();")); - O((" virtual ~BaseScript();")); + O((" virtual ~BaseScript() = default;")); O((" virtual int16_t CallEvent(int event, tOSIRISEventInfo *data);")); O(("};")); O(("")); @@ -10273,16 +10272,6 @@ int CDallasMainDlg::CreateScriptFile(char *filename) { O(("//=======================")); O(("")); - O(("BaseScript::BaseScript()")); - O(("{")); - O(("}")); - O(("")); - - O(("BaseScript::~BaseScript()")); - O(("{")); - O(("}")); - O(("")); - O(("int16_t BaseScript::CallEvent(int event,tOSIRISEventInfo *data)")); O(("{")); O((" mprintf(0,\"BaseScript::CallEvent()\\n\");")); diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp index 52fab662..f75da64a 100644 --- a/scripts/AIGame.cpp +++ b/scripts/AIGame.cpp @@ -343,8 +343,7 @@ static int GetObjectType(int object); class BaseObjScript { public: - BaseObjScript(); - virtual ~BaseObjScript(); + virtual ~BaseObjScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -367,7 +366,6 @@ private: void DoInit(int me_handle); public: - Pest() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -392,7 +390,6 @@ private: void DoInterval(int me_handle); public: - Stinger() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -460,7 +457,6 @@ private: void DoInterval(int me_handle); public: - SuperThief() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -510,7 +506,6 @@ private: bool DoNotify(int me, tOSIRISEventInfo *data); public: - Humonculous() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -536,7 +531,6 @@ private: void DoInit(int me_handle); public: - Dragon() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -556,7 +550,6 @@ private: void DoInit(int me_handle); public: - Tracker() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -578,7 +571,6 @@ private: lance_data *memory = nullptr; public: - Lance() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -597,7 +589,6 @@ private: void DoInit(int me_handle); public: - Flak() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -611,7 +602,6 @@ private: void DoCollide(int me); public: - Seeker() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -629,7 +619,6 @@ private: void DoInit(int me_handle); public: - SuperTrooper() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -675,7 +664,6 @@ private: void SetMode(int me, char mode); public: - Sparky() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -738,7 +726,6 @@ private: void SetMode(int me, char mode); public: - Hellion() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -812,7 +799,6 @@ private: void UpdateSquad(int me); public: - MantaRay() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -859,7 +845,6 @@ private: void UpdateSquad(int me); public: - Skiff() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -902,7 +887,6 @@ private: void SetMode(int me, char mode); public: - SpyHunter() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -930,7 +914,6 @@ class Sniper final : public BaseObjScript { void SetMode(int me, char mode); public: - Sniper() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -958,7 +941,6 @@ class SniperNoRun final : public BaseObjScript { void SetMode(int me, char mode); public: - SniperNoRun() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -983,7 +965,6 @@ class EvaderModA final : public BaseObjScript { void SetMode(int me, char mode); public: - EvaderModA() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1011,7 +992,6 @@ class FlameRAS final : public BaseObjScript { void SetMode(int me, char mode); public: - FlameRAS() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1049,7 +1029,6 @@ private: void SetMode(int me, char mode); public: - Jugg() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1074,7 +1053,6 @@ private: void DoFrame(int me_handle); public: - DTower() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1097,7 +1075,6 @@ private: void DoFrame(int me_handle); public: - DCollector() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1117,7 +1094,6 @@ private: void DoFrame(int me_handle); public: - CBall() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1138,7 +1114,6 @@ private: bool DoNotify(int me_handle, tOSIRISEVTAINOTIFY *notify); public: - SixGun() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1196,7 +1171,6 @@ private: bool DoNotify(int me_handle, tOSIRISEVTAINOTIFY *notify); public: - Sickle() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1210,7 +1184,6 @@ struct tBettyBombInfo { class BettyBomb final : public BaseObjScript { public: - BettyBomb() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); private: @@ -1224,7 +1197,6 @@ struct tBettyInfo { class BettyScript final : public BaseObjScript { public: - BettyScript() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: @@ -1244,7 +1216,6 @@ struct tChaffInfo { class ChaffScript final : public BaseObjScript { public: - ChaffScript() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: @@ -1262,7 +1233,6 @@ struct tChaffChunkInfo { class ChaffChunkScript final : public BaseObjScript { public: - ChaffChunkScript() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: @@ -1284,7 +1254,6 @@ private: void DoCollide(int me); public: - ProxMine() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1294,7 +1263,6 @@ public: class Gunboy final : public BaseObjScript { public: - Gunboy() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1315,7 +1283,6 @@ private: void DoFrame(int me); public: - GBPowerup() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1337,7 +1304,6 @@ private: void DoCollide(int me); public: - JoshBell() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1350,7 +1316,6 @@ private: void DoCollide(int me, int it_handle); public: - ExplodeOnContact() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1363,7 +1328,6 @@ private: void DoCollide(int me, int it_handle); public: - DestroyOnContact() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1591,7 +1555,6 @@ private: void AddGetToGoalCommonGoals(int me); public: - GuideBot() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1726,7 +1689,6 @@ private: void DoSubModeFrame(int me); public: - Thief() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2306,7 +2268,6 @@ private: void DoFrame(int me_handle); public: - FireAtDist() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2326,7 +2287,6 @@ private: void DoFrame(int me_handle); public: - HatePTMC() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2350,7 +2310,6 @@ private: bool DoNotify(int me, tOSIRISEVTAINOTIFY *notify); public: - Tubbs() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2375,7 +2334,6 @@ private: bool DoNotify(int me, tOSIRISEVTAINOTIFY *notify); public: - OldScratch() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2441,7 +2399,6 @@ private: bool SetMode(int me, char mode, int it = OBJECT_HANDLE_NONE); public: - BarnSwallow() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2809,10 +2766,6 @@ static inline bool IsGoalFinishedNotify(int index) { //============================================ // Script Implementation //============================================ -BaseObjScript::BaseObjScript() {} - -BaseObjScript::~BaseObjScript() {} - int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //----------------- diff --git a/scripts/AIGame3.cpp b/scripts/AIGame3.cpp index 7798e73c..19ebd5e2 100644 --- a/scripts/AIGame3.cpp +++ b/scripts/AIGame3.cpp @@ -601,8 +601,7 @@ static tScriptInfo ScriptInfo[NUM_IDS] = { class BaseObjScript { public: - BaseObjScript(); - virtual ~BaseObjScript(); + virtual ~BaseObjScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -865,7 +864,6 @@ private: void DoSquadieFrame(int me); public: - AlienOrganism() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1002,7 +1000,6 @@ private: void EnableGunAttack(int me, bool enable = true); public: - HeavyTrooper() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1104,7 +1101,6 @@ private: void UpdateLiftBeam(int me); public: - Lifter() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1330,7 +1326,6 @@ private: void DoCustomLookups(void); public: - AlienBoss() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1399,7 +1394,6 @@ private: bool ReceiveCommand(int me, int it, char command, void *ptr); public: - SecurityCamera() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1439,7 +1433,6 @@ private: bool ReceiveCommand(int me, int it, char command, void *ptr); public: - CrowdControl() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1631,10 +1624,6 @@ int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state) { return 0; } //============================================ // Script Implementation //============================================ -BaseObjScript::BaseObjScript() {} - -BaseObjScript::~BaseObjScript() {} - int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //--------------------- diff --git a/scripts/BatteriesIncluded.cpp b/scripts/BatteriesIncluded.cpp index be658f4a..701ad1a3 100644 --- a/scripts/BatteriesIncluded.cpp +++ b/scripts/BatteriesIncluded.cpp @@ -97,8 +97,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1272,10 +1271,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/BossCamera.cpp b/scripts/BossCamera.cpp index 45527d99..d66d0ccf 100644 --- a/scripts/BossCamera.cpp +++ b/scripts/BossCamera.cpp @@ -61,8 +61,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -515,10 +514,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/CanyonsCTF.cpp b/scripts/CanyonsCTF.cpp index 992190f2..bcca7c1c 100644 --- a/scripts/CanyonsCTF.cpp +++ b/scripts/CanyonsCTF.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -493,10 +492,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/CellTestLevel.cpp b/scripts/CellTestLevel.cpp index 615f1478..5bc6d9e3 100644 --- a/scripts/CellTestLevel.cpp +++ b/scripts/CellTestLevel.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -495,10 +494,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/ChrisTest.cpp b/scripts/ChrisTest.cpp index 0eeffe06..ffbd5a4f 100644 --- a/scripts/ChrisTest.cpp +++ b/scripts/ChrisTest.cpp @@ -61,8 +61,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -531,10 +530,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Geodomes.cpp b/scripts/Geodomes.cpp index b591c6af..4ee1f1b4 100644 --- a/scripts/Geodomes.cpp +++ b/scripts/Geodomes.cpp @@ -64,8 +64,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -582,10 +581,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/HalfPipe.cpp b/scripts/HalfPipe.cpp index 18a66e64..277e5c42 100644 --- a/scripts/HalfPipe.cpp +++ b/scripts/HalfPipe.cpp @@ -64,8 +64,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -585,10 +584,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/InfernalBolt.cpp b/scripts/InfernalBolt.cpp index 1ef6c116..bfc10cd1 100644 --- a/scripts/InfernalBolt.cpp +++ b/scripts/InfernalBolt.cpp @@ -62,8 +62,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -571,10 +570,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Inversion.cpp b/scripts/Inversion.cpp index 2a3399b2..2d9d089b 100644 --- a/scripts/Inversion.cpp +++ b/scripts/Inversion.cpp @@ -81,8 +81,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -977,10 +976,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/LEVEL0.cpp b/scripts/LEVEL0.cpp index 8ee88459..a643c6a5 100644 --- a/scripts/LEVEL0.cpp +++ b/scripts/LEVEL0.cpp @@ -83,8 +83,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1001,10 +1000,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/LEVEL15.cpp b/scripts/LEVEL15.cpp index 3118c529..015e9118 100644 --- a/scripts/LEVEL15.cpp +++ b/scripts/LEVEL15.cpp @@ -117,8 +117,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2438,10 +2437,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Level12.cpp b/scripts/Level12.cpp index 654b6df0..d0e2c65d 100644 --- a/scripts/Level12.cpp +++ b/scripts/Level12.cpp @@ -174,8 +174,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3121,10 +3120,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Level16.cpp b/scripts/Level16.cpp index 1dec8b8e..b3de5d82 100644 --- a/scripts/Level16.cpp +++ b/scripts/Level16.cpp @@ -67,8 +67,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -656,10 +655,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Level6.cpp b/scripts/Level6.cpp index ddcc986e..806a4ab6 100644 --- a/scripts/Level6.cpp +++ b/scripts/Level6.cpp @@ -117,8 +117,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2384,10 +2383,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Level9.cpp b/scripts/Level9.cpp index 993b3d1f..8d7f65fd 100644 --- a/scripts/Level9.cpp +++ b/scripts/Level9.cpp @@ -105,8 +105,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1584,10 +1583,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/LevelS1.cpp b/scripts/LevelS1.cpp index a4fc2672..d125ff6b 100644 --- a/scripts/LevelS1.cpp +++ b/scripts/LevelS1.cpp @@ -68,8 +68,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -699,10 +698,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc02.cpp b/scripts/Merc02.cpp index c5691a18..a0df071c 100644 --- a/scripts/Merc02.cpp +++ b/scripts/Merc02.cpp @@ -123,8 +123,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2394,10 +2393,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc1.cpp b/scripts/Merc1.cpp index 6900399c..76fc2ba3 100644 --- a/scripts/Merc1.cpp +++ b/scripts/Merc1.cpp @@ -173,8 +173,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3375,10 +3374,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc3.cpp b/scripts/Merc3.cpp index e7f525db..b040dd90 100644 --- a/scripts/Merc3.cpp +++ b/scripts/Merc3.cpp @@ -175,8 +175,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -4133,10 +4132,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc4.cpp b/scripts/Merc4.cpp index 4e7ac6ec..ac2c2352 100644 --- a/scripts/Merc4.cpp +++ b/scripts/Merc4.cpp @@ -98,8 +98,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1847,10 +1846,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc6.cpp b/scripts/Merc6.cpp index d0ee6ac6..70778578 100644 --- a/scripts/Merc6.cpp +++ b/scripts/Merc6.cpp @@ -109,8 +109,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1922,10 +1921,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Merc7.cpp b/scripts/Merc7.cpp index 96c17552..b7bfeab7 100644 --- a/scripts/Merc7.cpp +++ b/scripts/Merc7.cpp @@ -144,8 +144,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3303,10 +3302,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Mysterious_Isle.cpp b/scripts/Mysterious_Isle.cpp index 32e30ecd..28eea154 100644 --- a/scripts/Mysterious_Isle.cpp +++ b/scripts/Mysterious_Isle.cpp @@ -71,8 +71,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -827,10 +826,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Paranoia.cpp b/scripts/Paranoia.cpp index 0c57358e..bd2335ea 100644 --- a/scripts/Paranoia.cpp +++ b/scripts/Paranoia.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -449,10 +448,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/PiccuStation.cpp b/scripts/PiccuStation.cpp index 77f5e95e..a98d7930 100644 --- a/scripts/PiccuStation.cpp +++ b/scripts/PiccuStation.cpp @@ -135,8 +135,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2133,10 +2132,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Polaris.cpp b/scripts/Polaris.cpp index 4671c2f4..d699e28c 100644 --- a/scripts/Polaris.cpp +++ b/scripts/Polaris.cpp @@ -66,8 +66,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -606,10 +605,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Quadsomniac.cpp b/scripts/Quadsomniac.cpp index ca3e1275..3021ef8a 100644 --- a/scripts/Quadsomniac.cpp +++ b/scripts/Quadsomniac.cpp @@ -68,8 +68,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -666,10 +665,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/RudeAwakening.cpp b/scripts/RudeAwakening.cpp index d241d6dd..a190a978 100644 --- a/scripts/RudeAwakening.cpp +++ b/scripts/RudeAwakening.cpp @@ -68,8 +68,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -653,10 +652,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/SewerRat.cpp b/scripts/SewerRat.cpp index a5dd9e1d..c4f21347 100644 --- a/scripts/SewerRat.cpp +++ b/scripts/SewerRat.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -508,10 +507,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/TrainingMission.cpp b/scripts/TrainingMission.cpp index cadc9b49..6544434c 100644 --- a/scripts/TrainingMission.cpp +++ b/scripts/TrainingMission.cpp @@ -90,8 +90,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1326,10 +1325,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/Y2K.cpp b/scripts/Y2K.cpp index bc5a273e..7479d28d 100644 --- a/scripts/Y2K.cpp +++ b/scripts/Y2K.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -513,10 +512,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp index 37b55c60..90f48098 100644 --- a/scripts/aigame2.cpp +++ b/scripts/aigame2.cpp @@ -101,10 +101,6 @@ protected: #define PEST_STATE_HIVE 1 class aiSamirPest final : public aiObjScript { -public: - aiSamirPest(); - ~aiSamirPest(); - private: struct t_pest_memory { int tail_handle; @@ -134,10 +130,6 @@ protected: #define STATE_STALK 6 // stalks player class aiBlackStormTrooper final : public aiObjScript { -public: - aiBlackStormTrooper(); - ~aiBlackStormTrooper(); - private: struct t_bst_memory { float timer; @@ -184,10 +176,6 @@ private: }; class aiCreeper final : public aiObjScript { -public: - aiCreeper(); - ~aiCreeper(); - private: struct t_creep_memory { float timer; @@ -220,10 +208,6 @@ class aiLukeTurret final : public aiObjScript { t_lturret_memory *memory = nullptr; -public: - aiLukeTurret(){}; - ~aiLukeTurret(){}; - protected: virtual void OnInit(int me_handle); virtual bool OnNotify(int me_handle, tOSIRISEVTAINOTIFY *data); @@ -238,10 +222,6 @@ class aiSTBlackBarrel final : public aiObjScript { t_stblackbarrel_memory *memory = nullptr; -public: - aiSTBlackBarrel(){}; - ~aiSTBlackBarrel(){}; - protected: virtual void OnInit(int me_handle); virtual void OnDestroy(int me_handle, tOSIRISEVTDESTROY *evt); @@ -606,11 +586,6 @@ int16_t aiObjScript::CallEvent(int event, tOSIRISEventInfo *data) { // aiSamirPest // The Samir Pest -// ai base class -aiSamirPest::aiSamirPest() {} - -aiSamirPest::~aiSamirPest() {} - void aiSamirPest::OnInit(int me_handle) { tOSIRISMEMCHUNK ch; @@ -691,11 +666,6 @@ bool aiSamirPest::OnNotify(int me_handle, tOSIRISEVTAINOTIFY *data) { return tru // aiBlackStormTrooper // CED Black Stormtrooper -// ai base class -aiBlackStormTrooper::aiBlackStormTrooper() {} - -aiBlackStormTrooper::~aiBlackStormTrooper() {} - void aiBlackStormTrooper::OnInit(int me_handle) { tOSIRISMEMCHUNK ch; int n_pts, j, i; @@ -1200,11 +1170,6 @@ retry_set_state: ////////////////////////////////////////////////////////////////////////////// // aiCreeper -// ai base class -aiCreeper::aiCreeper() {} - -aiCreeper::~aiCreeper() {} - void aiCreeper::OnInit(int me_handle) { tOSIRISMEMCHUNK ch; int flags; diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp index 57e37f27..6c117ebf 100644 --- a/scripts/aigame4.cpp +++ b/scripts/aigame4.cpp @@ -125,8 +125,7 @@ static int aigame_mod_id; class BaseObjScript { public: - BaseObjScript(); - virtual ~BaseObjScript(); + virtual ~BaseObjScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -147,7 +146,6 @@ private: combwallhit_data *memory = nullptr; public: - CombWallHit() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -165,7 +163,6 @@ private: droptarget_data *memory = nullptr; public: - DropTarget() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -182,7 +179,6 @@ class Gun final : public BaseObjScript { gun_data *memory = nullptr; public: - Gun() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -199,7 +195,6 @@ private: casing_data *memory = nullptr; public: - Casing() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -260,7 +255,6 @@ private: void PlayRandomSound(int me); public: - MercEndBoss() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -273,7 +267,6 @@ private: void DoInit(int me); public: - HangLight() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -417,10 +410,6 @@ static inline bool IsGoalFinishedNotify(int index) { //============================================ // Script Implementation //============================================ -BaseObjScript::BaseObjScript() {} - -BaseObjScript::~BaseObjScript() {} - int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } //------------------ diff --git a/scripts/barney.cpp b/scripts/barney.cpp index 4f0c7755..2e0a939e 100644 --- a/scripts/barney.cpp +++ b/scripts/barney.cpp @@ -59,8 +59,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -471,10 +470,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/clutter.cpp b/scripts/clutter.cpp index fcdde0d1..dc309895 100644 --- a/scripts/clutter.cpp +++ b/scripts/clutter.cpp @@ -104,14 +104,12 @@ struct tTNTHighYield { }; class TNTHighYield final : public ClutterScript { public: - TNTHighYield() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); tTNTHighYield *memory = nullptr; }; class TNTMedYield final : public ClutterScript { public: - TNTMedYield() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); float *memory = nullptr; }; @@ -121,13 +119,11 @@ struct tFallingRock { }; class FallingRock final : public ClutterScript { public: - FallingRock() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); tFallingRock *memory = nullptr; }; class LavaRock final : public ClutterScript { public: - LavaRock() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); tFallingRock *memory = nullptr; }; diff --git a/scripts/generic.cpp b/scripts/generic.cpp index 1747915c..31626cff 100644 --- a/scripts/generic.cpp +++ b/scripts/generic.cpp @@ -87,7 +87,6 @@ tScriptIDInfo ScriptIDInfo[NUM_IDS] = { class GenericScript { public: - GenericScript() {} virtual ~GenericScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); @@ -96,7 +95,6 @@ protected: class GenericDoor final : public GenericScript { public: - GenericDoor() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -106,14 +104,12 @@ struct forcewallmemory { class ForceWallScript final : public GenericScript { public: - ForceWallScript(); int16_t CallEvent(int event, tOSIRISEventInfo *data); forcewallmemory *memory = nullptr; }; class WingNutScript final : public GenericScript { public: - WingNutScript() {} int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -129,8 +125,6 @@ struct rapidfirememory { class RapidFireScript final : public GenericScript { public: - RapidFireScript(); - int16_t CallEvent(int event, tOSIRISEventInfo *data); rapidfirememory *memory = nullptr; }; @@ -383,8 +377,6 @@ int16_t GenericDoor::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -RapidFireScript::RapidFireScript() {} - #define RAPIDFIRE_RECHARGE 0.7f int16_t RapidFireScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { @@ -528,8 +520,6 @@ int16_t RapidFireScript::CallEvent(int event, tOSIRISEventInfo *data) { return CONTINUE_CHAIN | CONTINUE_DEFAULT; } -ForceWallScript::ForceWallScript() {} - int16_t ForceWallScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { diff --git a/scripts/level1.cpp b/scripts/level1.cpp index a27921f4..d8de1a8a 100644 --- a/scripts/level1.cpp +++ b/scripts/level1.cpp @@ -85,8 +85,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1077,10 +1076,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level10.cpp b/scripts/level10.cpp index 85e5fe72..54262260 100644 --- a/scripts/level10.cpp +++ b/scripts/level10.cpp @@ -144,8 +144,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2545,10 +2544,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level11.cpp b/scripts/level11.cpp index 9e70cf79..be64132d 100644 --- a/scripts/level11.cpp +++ b/scripts/level11.cpp @@ -209,8 +209,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3512,10 +3511,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level13.cpp b/scripts/level13.cpp index 06ecffbd..c3eae284 100644 --- a/scripts/level13.cpp +++ b/scripts/level13.cpp @@ -167,8 +167,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2770,10 +2769,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level14.cpp b/scripts/level14.cpp index 4ae1990a..2d91f142 100644 --- a/scripts/level14.cpp +++ b/scripts/level14.cpp @@ -107,8 +107,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1770,10 +1769,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level17.cpp b/scripts/level17.cpp index 85dea704..5f1d138d 100644 --- a/scripts/level17.cpp +++ b/scripts/level17.cpp @@ -193,8 +193,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3184,10 +3183,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level2.cpp b/scripts/level2.cpp index 084f23ae..e485902b 100644 --- a/scripts/level2.cpp +++ b/scripts/level2.cpp @@ -127,8 +127,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2170,10 +2169,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level3.cpp b/scripts/level3.cpp index e1fe4564..740f7319 100644 --- a/scripts/level3.cpp +++ b/scripts/level3.cpp @@ -124,8 +124,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -2000,10 +1999,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level4.cpp b/scripts/level4.cpp index 58bd871d..42d0be8d 100644 --- a/scripts/level4.cpp +++ b/scripts/level4.cpp @@ -75,8 +75,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -972,10 +971,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level5.cpp b/scripts/level5.cpp index 23f3c3fd..0d16e2cd 100644 --- a/scripts/level5.cpp +++ b/scripts/level5.cpp @@ -94,8 +94,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1465,10 +1464,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level7.cpp b/scripts/level7.cpp index e37908d7..d4657d55 100644 --- a/scripts/level7.cpp +++ b/scripts/level7.cpp @@ -126,8 +126,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1881,10 +1880,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/level8.cpp b/scripts/level8.cpp index c430ad80..22e0eb9f 100644 --- a/scripts/level8.cpp +++ b/scripts/level8.cpp @@ -122,8 +122,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1926,10 +1925,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/levelS2.cpp b/scripts/levelS2.cpp index 71c574cb..9c01aa51 100644 --- a/scripts/levelS2.cpp +++ b/scripts/levelS2.cpp @@ -194,8 +194,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -3231,10 +3230,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/merc5.cpp b/scripts/merc5.cpp index 6d53b0e0..0cc9c4e4 100644 --- a/scripts/merc5.cpp +++ b/scripts/merc5.cpp @@ -107,8 +107,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -1989,10 +1988,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/myPowerHouse.cpp b/scripts/myPowerHouse.cpp index 94d1d312..faf6f5d3 100644 --- a/scripts/myPowerHouse.cpp +++ b/scripts/myPowerHouse.cpp @@ -61,8 +61,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -513,10 +512,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/orbital.cpp b/scripts/orbital.cpp index 86f8394c..c566fc73 100644 --- a/scripts/orbital.cpp +++ b/scripts/orbital.cpp @@ -62,8 +62,7 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state); class BaseScript { public: - BaseScript(); - virtual ~BaseScript(); + virtual ~BaseScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); }; @@ -725,10 +724,6 @@ int STDCALL GetCOScriptList(int **list, int **id_list) { // Script Implementation //======================= -BaseScript::BaseScript() {} - -BaseScript::~BaseScript() {} - int16_t BaseScript::CallEvent(int event, tOSIRISEventInfo *data) { mprintf(0, "BaseScript::CallEvent()\n"); return CONTINUE_CHAIN | CONTINUE_DEFAULT; diff --git a/scripts/testscript.cpp b/scripts/testscript.cpp index 35512fde..0781c840 100644 --- a/scripts/testscript.cpp +++ b/scripts/testscript.cpp @@ -55,8 +55,7 @@ tScriptInfo ScriptInfo[MAX_IDS] = {{ID_SHIELD_ORB, "Shield"}, {ID_ENERGY_ORB, "E class BaseObjScript { public: - BaseObjScript(); - virtual ~BaseObjScript(); + virtual ~BaseObjScript() = default; virtual int16_t CallEvent(int event, tOSIRISEventInfo *data); protected: @@ -161,10 +160,6 @@ int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state) { return 0; } //============================================ // Script Implementation //============================================ -BaseObjScript::BaseObjScript() {} - -BaseObjScript::~BaseObjScript() {} - int16_t BaseObjScript::CallEvent(int event, tOSIRISEventInfo *data) { switch (event) { case EVT_INTERVAL: